ir: Make canonicalization stable wrt typedefs in fn return types

In the grand scheme of things, two function return types can be equal
modulo typedefs.  Because those two function textual representations
are different, the two overall function types would end up having
different canonical types and thus, the two functions would be
considered as having different sub-types.  The harmless change pass
would then kick in and flag that change as harmless.  But then, "abidw
--abidiff" that is used for testing purposes would still be not happy.

This patch strips typedefs off of return types of function types when
the string representation is to be used for internal (e.g, type
canonicalization) purposes.

The fix for this change uncovered another issue:

When setting the naming typedefs for an (anonymous) C++ class, the
qualified name of the class was wrongly being set to the qualified
name of the typedef.  Only the name of the class should be affected,
in essence.  The qualified name would, ONLY as a result of the name
change, be adjusted.

This patch fixes those issues and adjusts the test suite accordingly.

	* src/abg-ir.cc (get_function_type_name, get_method_type_name):
	When the function type name is for internal purposes, strip
	potential typedefs off.
	(equal): In the overload for function_type, strip potential
	typedefs off of return types before comparing them.
	(decl_base::set_naming_typedef): Properly adjust the qualified
	name of the type to which a naming typedef is being set.
	* tests/data/test-alt-dwarf-file/libstdc++/libstdc++-report.txt:
	New reference test output.
	* tests/data/test-alt-dwarf-file/libstdc++/usr/lib/debug/usr/lib64/libstdc++.so.6.0.30-12.1.1-1.fc37.x86_64.debug:
	New binary test input.
	* tests/data/test-alt-dwarf-file/libstdc++/usr/lib64/libstdc++.so.6.0.30:
	New binary test input.
	* tests/data/Makefile.am: Add the new test material to source
	distribution.
	* tests/data/test-annotate/test15-pr18892.so.abi: Adjust.
	* tests/data/test-annotate/test17-pr19027.so.abi: Likewise.
	* tests/data/test-annotate/test21-pr19092.so.abi: Likewise.
	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
	* tests/data/test-read-dwarf/test-libaaudio.so.abi: Likewise.
	* tests/data/test-read-dwarf/test-libandroid.so.abi: Likewise.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Likewise.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 842d81ddf523383dda0d8461fa0578652298bc09..801a7445b0a268ddf7089b4b234747ced8f094ee 100644 (file)
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -4745,7 +4745,8 @@ decl_base::set_naming_typedef(const typedef_decl_sptr& t)
 
   priv_->naming_typedef_ = t;
   set_name(t->get_name());
-  set_qualified_name(t->get_qualified_name());
+  string qualified_name = build_qualified_name(get_scope(), t->get_name());
+  set_qualified_name(get_environment()->intern(qualified_name));
   set_is_anonymous(false);
   // Now that the qualified type of the decl has changed, let's update
   // the qualified names of the member types of this decls.
@@ -8554,7 +8555,14 @@ get_function_type_name(const function_type& fn_type,
                       bool internal)
 {
   std::ostringstream o;
-  type_base_sptr return_type = fn_type.get_return_type();
+  // When the function name is used for internal purposes (e.g, for
+  // canonicalization), we want its representation to stay the same,
+  // regardless of typedefs.  So let's strip typedefs from the return
+  // type.
+  type_base_sptr return_type =
+    internal
+    ? peel_typedef_type(fn_type.get_return_type())
+    : fn_type.get_return_type();
   const environment* env = fn_type.get_environment();
   ABG_ASSERT(env);
 
@@ -8625,7 +8633,14 @@ get_method_type_name(const method_type& fn_type,
                     bool internal)
 {
   std::ostringstream o;
-  type_base_sptr return_type= fn_type.get_return_type();
+  // When the function name is used for internal purposes (e.g, for
+  // canonicalization), we want its representation to stay the same,
+  // regardless of typedefs.  So let's strip typedefs from the return
+  // type.
+  type_base_sptr return_type =
+    internal
+    ? peel_typedef_type(fn_type.get_return_type())
+    : fn_type.get_return_type();
   const environment* env = fn_type.get_environment();
   ABG_ASSERT(env);
 
@@ -19099,7 +19114,15 @@ equals(const function_type& l,
 
   if (compare_result_types)
     {
-      if (l.get_return_type() != r.get_return_type())
+      // Let's not consider typedefs when comparing return types to
+      // avoid spurious changes.
+      //
+      // TODO: We should also do this for parameter types, or rather,
+      // we should teach the equality operators in the IR, at some
+      // point, to peel typedefs off.
+      if (peel_typedef_type(l.get_return_type())
+         !=
+         peel_typedef_type(r.get_return_type()))
        {
          result = false;
          if (k)

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a0c086d9e2688b5393806be2e8d2566ca8d2573a..df5247e10da623f6831723c196e1025ce9bbaab2 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1698,6 +1698,9 @@ test-alt-dwarf-file/rhbz1951526/rhbz1951526-report-0.txt \
 test-alt-dwarf-file/rhbz1951526/usr/bin/gimp-2.10 \
 test-alt-dwarf-file/rhbz1951526/usr/lib/debug/.dwz/gimp-2.10.22-2.el9.1.aarch64 \
 test-alt-dwarf-file/rhbz1951526/usr/lib/debug/usr/bin/gimp-2.10-2.10.22-2.el9.1.aarch64.debug \
+test-alt-dwarf-file/libstdc++/libstdc++-report.txt \
+test-alt-dwarf-file/libstdc++/usr/lib/debug/usr/lib64/libstdc++.so.6.0.30-12.1.1-1.fc37.x86_64.debug \
+test-alt-dwarf-file/libstdc++/usr/lib64/libstdc++.so.6.0.30 \
 \
 test-abicompat/libtest0-fn-changed-libapp-v0.so \
 test-abicompat/libtest0-fn-changed-libapp-v1.so \

diff --git a/tests/data/test-alt-dwarf-file/libstdc++/libstdc++-report.txt b/tests/data/test-alt-dwarf-file/libstdc++/libstdc++-report.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/data/test-alt-dwarf-file/libstdc++/usr/lib/debug/usr/lib64/libstdc++.so.6.0.30-12.1.1-1.fc37.x86_64.debug b/tests/data/test-alt-dwarf-file/libstdc++/usr/lib/debug/usr/lib64/libstdc++.so.6.0.30-12.1.1-1.fc37.x86_64.debug
new file mode 100644 (file)
index 0000000..070fc12
Binary files /dev/null and b/tests/data/test-alt-dwarf-file/libstdc++/usr/lib/debug/usr/lib64/libstdc++.so.6.0.30-12.1.1-1.fc37.x86_64.debug differ

diff --git a/tests/data/test-alt-dwarf-file/libstdc++/usr/lib64/libstdc++.so.6.0.30 b/tests/data/test-alt-dwarf-file/libstdc++/usr/lib64/libstdc++.so.6.0.30
new file mode 100755 (executable)
index 0000000..c9bfb8e
Binary files /dev/null and b/tests/data/test-alt-dwarf-file/libstdc++/usr/lib64/libstdc++.so.6.0.30 differ

diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 7f8fb6c9f7af994f35b264fc91fec9228f7a7f37..d5209801aa949a76a8245c361c72d021df3a4102 100644 (file)
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -11618,92 +11618,92 @@
     <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-789'/>
     <!-- long double* -->
     <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-790'/>
-    <!-- long int* -->
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-791'/>
-    <!-- my_siginfo_t* -->
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-792'/>
-    <!-- sanitizer_kernel_iovec* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-381'/>
-    <!-- sanitizer_kernel_mmsghdr* -->
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-793'/>
-    <!-- sanitizer_kernel_msghdr* -->
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-794'/>
-    <!-- sanitizer_kernel_sockaddr* -->
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-795'/>
-    <!-- sigaction_t* -->
-    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-796'/>
-    <!-- typedef INTMAX_T (const char*, char**, int)* -->
-    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-798'/>
-    <!-- typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-800'/>
-    <!-- typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
-    <!-- typedef SIZE_T (char*, const wchar_t*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
-    <!-- typedef SIZE_T (int, char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-805' size-in-bits='64' id='type-id-806'/>
-    <!-- typedef SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*)* -->
-    <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-808'/>
-    <!-- typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-809' size-in-bits='64' id='type-id-810'/>
-    <!-- typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
-    <!-- typedef SIZE_T (wchar_t*, const char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-814'/>
     <!-- typedef SSIZE_T (char**, SIZE_T*, int, void*)* -->
-    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-816'/>
+    <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-792'/>
     <!-- typedef SSIZE_T (char**, SIZE_T*, void*)* -->
-    <pointer-type-def type-id='type-id-817' size-in-bits='64' id='type-id-818'/>
+    <pointer-type-def type-id='type-id-793' size-in-bits='64' id='type-id-794'/>
     <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* -->
-    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-820'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-796'/>
     <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF64_T)* -->
-    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-798'/>
     <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* -->
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-824'/>
+    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-800'/>
     <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int)* -->
-    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
+    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
+    <!-- typedef long_t (int, void*, int)* -->
+    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
     <!-- typedef SSIZE_T (int, void*, typedef OFF64_T, typedef OFF64_T)* -->
-    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-828'/>
+    <pointer-type-def type-id='type-id-805' size-in-bits='64' id='type-id-806'/>
     <!-- typedef SSIZE_T (int, void*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-830'/>
+    <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-808'/>
     <!-- typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF64_T)* -->
-    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-832'/>
+    <pointer-type-def type-id='type-id-809' size-in-bits='64' id='type-id-810'/>
     <!-- typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* -->
-    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-834'/>
+    <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
+    <!-- typedef long_t (int, void*, typedef long_t, int)* -->
+    <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-814'/>
     <!-- typedef __sanitizer::__sanitizer_clock_t (void*)* -->
-    <pointer-type-def type-id='type-id-835' size-in-bits='64' id='type-id-836'/>
+    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-816'/>
+    <!-- long int* -->
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-817'/>
+    <!-- typedef INTMAX_T (const char*, char**, int)* -->
+    <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-819'/>
+    <!-- my_siginfo_t* -->
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-820'/>
+    <!-- sanitizer_kernel_iovec* -->
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-381'/>
+    <!-- sanitizer_kernel_mmsghdr* -->
+    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-821'/>
+    <!-- sanitizer_kernel_msghdr* -->
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-822'/>
+    <!-- sanitizer_kernel_sockaddr* -->
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-823'/>
+    <!-- sigaction_t* -->
+    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-824'/>
+    <!-- typedef __va_list_tag __va_list_tag* -->
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-825'/>
+    <!-- unsigned int (unsigned int)* -->
+    <pointer-type-def type-id='type-id-826' size-in-bits='64' id='type-id-827'/>
+    <!-- unsigned int* -->
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-166'/>
+    <!-- typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, typedef SIZE_T, void*)* -->
+    <pointer-type-def type-id='type-id-828' size-in-bits='64' id='type-id-829'/>
+    <!-- typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, void*)* -->
+    <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-831'/>
+    <!-- typedef SIZE_T (char*, const wchar_t*, typedef SIZE_T)* -->
+    <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-833'/>
     <!-- typedef __sanitizer::uptr (const char*)* -->
-    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-838'/>
+    <pointer-type-def type-id='type-id-834' size-in-bits='64' id='type-id-835'/>
+    <!-- typedef SIZE_T (int, char*, typedef SIZE_T)* -->
+    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-837'/>
     <!-- typedef __sanitizer::uptr (int, int, void*, void*)* -->
-    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-840'/>
+    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-839'/>
+    <!-- unsigned long int (unsigned long int*)* -->
+    <pointer-type-def type-id='type-id-840' size-in-bits='64' id='type-id-841'/>
     <!-- typedef __sanitizer::uptr (void*)* -->
-    <pointer-type-def type-id='type-id-841' size-in-bits='64' id='type-id-842'/>
+    <pointer-type-def type-id='type-id-842' size-in-bits='64' id='type-id-843'/>
+    <!-- typedef SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*)* -->
+    <pointer-type-def type-id='type-id-844' size-in-bits='64' id='type-id-845'/>
     <!-- typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* -->
-    <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-844'/>
-    <!-- typedef __va_list_tag __va_list_tag* -->
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-845'/>
-    <!-- typedef long_t (int, void*, int)* -->
     <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-847'/>
-    <!-- typedef long_t (int, void*, typedef long_t, int)* -->
+    <!-- typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, typedef SIZE_T, void*)* -->
     <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-849'/>
-    <!-- typedef sighandler_t (int, typedef sighandler_t)* -->
+    <!-- typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, void*)* -->
     <pointer-type-def type-id='type-id-850' size-in-bits='64' id='type-id-851'/>
-    <!-- unsigned int (unsigned int)* -->
+    <!-- typedef SIZE_T (wchar_t*, const char*, typedef SIZE_T)* -->
     <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-853'/>
-    <!-- unsigned int* -->
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-166'/>
-    <!-- unsigned long int (unsigned long int*)* -->
-    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-855'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-127'/>
     <!-- void (__sanitizer::uptr*, int)* -->
-    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-857'/>
+    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-855'/>
     <!-- void (double, double*, double*)* -->
-    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-859'/>
+    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-857'/>
     <!-- void (float, float*, float*)* -->
-    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-861'/>
+    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-859'/>
     <!-- void (int)* -->
     <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-218'/>
+    <!-- typedef sighandler_t (int, typedef sighandler_t)* -->
+    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-861'/>
     <!-- void (int, my_siginfo_t*, void*)* -->
     <pointer-type-def type-id='type-id-862' size-in-bits='64' id='type-id-389'/>
     <!-- void (int, void*)* -->
@@ -12494,7 +12494,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T)* read_f -->
-    <typedef-decl name='read_f' type-id='type-id-830' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' id='type-id-912'/>
+    <typedef-decl name='read_f' type-id='type-id-808' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' id='type-id-912'/>
     <!-- SSIZE_T __interceptor_pread(int, void*, SIZE_T, OFF_T) -->
     <function-decl name='__interceptor_pread' mangled-name='__interceptor_pread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread'>
       <!-- parameter of type 'int' -->
@@ -12509,7 +12509,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* pread_f -->
-    <typedef-decl name='pread_f' type-id='type-id-834' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' id='type-id-913'/>
+    <typedef-decl name='pread_f' type-id='type-id-812' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' id='type-id-913'/>
     <!-- SSIZE_T __interceptor_pread64(int, void*, SIZE_T, OFF64_T) -->
     <function-decl name='__interceptor_pread64' mangled-name='__interceptor_pread64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread64'>
       <!-- parameter of type 'int' -->
@@ -12524,7 +12524,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF64_T)* pread64_f -->
-    <typedef-decl name='pread64_f' type-id='type-id-832' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' id='type-id-914'/>
+    <typedef-decl name='pread64_f' type-id='type-id-810' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' id='type-id-914'/>
     <!-- SSIZE_T __interceptor_readv(int, __sanitizer::__sanitizer_iovec*, int) -->
     <function-decl name='__interceptor_readv' mangled-name='__interceptor_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readv'>
       <!-- parameter of type 'int' -->
@@ -12537,7 +12537,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* readv_f -->
-    <typedef-decl name='readv_f' type-id='type-id-820' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' id='type-id-915'/>
+    <typedef-decl name='readv_f' type-id='type-id-796' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' id='type-id-915'/>
     <!-- SSIZE_T __interceptor_preadv(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
     <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv'>
       <!-- parameter of type 'int' -->
@@ -12552,7 +12552,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* preadv_f -->
-    <typedef-decl name='preadv_f' type-id='type-id-824' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' id='type-id-916'/>
+    <typedef-decl name='preadv_f' type-id='type-id-800' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' id='type-id-916'/>
     <!-- SSIZE_T __interceptor_preadv64(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
     <function-decl name='__interceptor_preadv64' mangled-name='__interceptor_preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv64'>
       <!-- parameter of type 'int' -->
@@ -12567,7 +12567,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF64_T)* preadv64_f -->
-    <typedef-decl name='preadv64_f' type-id='type-id-822' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' id='type-id-917'/>
+    <typedef-decl name='preadv64_f' type-id='type-id-798' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' id='type-id-917'/>
     <!-- SSIZE_T __interceptor_write(int, void*, SIZE_T) -->
     <function-decl name='__interceptor_write' mangled-name='__interceptor_write' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_write'>
       <!-- parameter of type 'int' -->
@@ -12580,7 +12580,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T)* write_f -->
-    <typedef-decl name='write_f' type-id='type-id-830' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' id='type-id-918'/>
+    <typedef-decl name='write_f' type-id='type-id-808' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' id='type-id-918'/>
     <!-- SSIZE_T __interceptor_pwrite(int, void*, SIZE_T, OFF_T) -->
     <function-decl name='__interceptor_pwrite' mangled-name='__interceptor_pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite'>
       <!-- parameter of type 'int' -->
@@ -12595,7 +12595,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* pwrite_f -->
-    <typedef-decl name='pwrite_f' type-id='type-id-834' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' id='type-id-919'/>
+    <typedef-decl name='pwrite_f' type-id='type-id-812' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' id='type-id-919'/>
     <!-- SSIZE_T __interceptor_pwrite64(int, void*, OFF64_T, OFF64_T) -->
     <function-decl name='__interceptor_pwrite64' mangled-name='__interceptor_pwrite64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite64'>
       <!-- parameter of type 'int' -->
@@ -12610,7 +12610,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, void*, typedef OFF64_T, typedef OFF64_T)* pwrite64_f -->
-    <typedef-decl name='pwrite64_f' type-id='type-id-828' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' id='type-id-920'/>
+    <typedef-decl name='pwrite64_f' type-id='type-id-806' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' id='type-id-920'/>
     <!-- SSIZE_T __interceptor_writev(int, __sanitizer::__sanitizer_iovec*, int) -->
     <function-decl name='__interceptor_writev' mangled-name='__interceptor_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_writev'>
       <!-- parameter of type 'int' -->
@@ -12623,7 +12623,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* writev_f -->
-    <typedef-decl name='writev_f' type-id='type-id-820' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' id='type-id-921'/>
+    <typedef-decl name='writev_f' type-id='type-id-796' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' id='type-id-921'/>
     <!-- SSIZE_T __interceptor_pwritev(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
     <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev'>
       <!-- parameter of type 'int' -->
@@ -12638,7 +12638,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* pwritev_f -->
-    <typedef-decl name='pwritev_f' type-id='type-id-824' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' id='type-id-922'/>
+    <typedef-decl name='pwritev_f' type-id='type-id-800' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' id='type-id-922'/>
     <!-- SSIZE_T __interceptor_pwritev64(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
     <function-decl name='__interceptor_pwritev64' mangled-name='__interceptor_pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev64'>
       <!-- parameter of type 'int' -->
@@ -12653,7 +12653,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF64_T)* pwritev64_f -->
-    <typedef-decl name='pwritev64_f' type-id='type-id-822' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' id='type-id-923'/>
+    <typedef-decl name='pwritev64_f' type-id='type-id-798' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' id='type-id-923'/>
     <!-- int __interceptor_prctl(int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) -->
     <function-decl name='__interceptor_prctl' mangled-name='__interceptor_prctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_prctl'>
       <!-- parameter of type 'int' -->
@@ -12679,7 +12679,7 @@
       <return type-id='type-id-105'/>
     </function-decl>
     <!-- typedef unsigned long int (unsigned long int*)* time_f -->
-    <typedef-decl name='time_f' type-id='type-id-855' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='432' column='1' id='type-id-925'/>
+    <typedef-decl name='time_f' type-id='type-id-841' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='432' column='1' id='type-id-925'/>
     <!-- __sanitizer::__sanitizer_tm* __interceptor_localtime(unsigned long int*) -->
     <function-decl name='__interceptor_localtime' mangled-name='__interceptor_localtime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_localtime'>
       <!-- parameter of type 'unsigned long int*' -->
@@ -12778,7 +12778,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -12791,7 +12791,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -12804,7 +12804,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -12815,7 +12815,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -12828,7 +12828,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -12841,7 +12841,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -13327,7 +13327,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int)* recvmsg_f -->
-    <typedef-decl name='recvmsg_f' type-id='type-id-826' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' id='type-id-977'/>
+    <typedef-decl name='recvmsg_f' type-id='type-id-802' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' id='type-id-977'/>
     <!-- int __interceptor_getpeername(int, void*, unsigned int*) -->
     <function-decl name='__interceptor_getpeername' mangled-name='__interceptor_getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getpeername'>
       <!-- parameter of type 'int' -->
@@ -13408,7 +13408,7 @@
       <return type-id='type-id-91'/>
     </function-decl>
     <!-- typedef typedef __sanitizer::uptr (int, int, void*, void*)* ptrace_f -->
-    <typedef-decl name='ptrace_f' type-id='type-id-840' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' id='type-id-984'/>
+    <typedef-decl name='ptrace_f' type-id='type-id-839' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' id='type-id-984'/>
     <!-- char* __interceptor_setlocale(int, char*) -->
     <function-decl name='__interceptor_setlocale' mangled-name='__interceptor_setlocale' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setlocale'>
       <!-- parameter of type 'int' -->
@@ -13452,7 +13452,7 @@
       <return type-id='type-id-900'/>
     </function-decl>
     <!-- typedef typedef INTMAX_T (const char*, char**, int)* strtoimax_f -->
-    <typedef-decl name='strtoimax_f' type-id='type-id-798' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' id='type-id-988'/>
+    <typedef-decl name='strtoimax_f' type-id='type-id-819' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' id='type-id-988'/>
     <!-- INTMAX_T __interceptor_strtoumax(const char*, char**, int) -->
     <function-decl name='__interceptor_strtoumax' mangled-name='__interceptor_strtoumax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strtoumax'>
       <!-- parameter of type 'const char*' -->
@@ -13465,7 +13465,7 @@
       <return type-id='type-id-900'/>
     </function-decl>
     <!-- typedef typedef INTMAX_T (const char*, char**, int)* strtoumax_f -->
-    <typedef-decl name='strtoumax_f' type-id='type-id-798' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' id='type-id-989'/>
+    <typedef-decl name='strtoumax_f' type-id='type-id-819' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' id='type-id-989'/>
     <!-- SIZE_T __interceptor_mbstowcs(wchar_t*, const char*, SIZE_T) -->
     <function-decl name='__interceptor_mbstowcs' mangled-name='__interceptor_mbstowcs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mbstowcs'>
       <!-- parameter of type 'wchar_t*' -->
@@ -13478,7 +13478,7 @@
       <return type-id='type-id-403'/>
     </function-decl>
     <!-- typedef typedef SIZE_T (wchar_t*, const char*, typedef SIZE_T)* mbstowcs_f -->
-    <typedef-decl name='mbstowcs_f' type-id='type-id-814' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1' id='type-id-990'/>
+    <typedef-decl name='mbstowcs_f' type-id='type-id-853' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1' id='type-id-990'/>
     <!-- SIZE_T __interceptor_mbsrtowcs(wchar_t*, const char**, SIZE_T, void*) -->
     <function-decl name='__interceptor_mbsrtowcs' mangled-name='__interceptor_mbsrtowcs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mbsrtowcs'>
       <!-- parameter of type 'wchar_t*' -->
@@ -13493,7 +13493,7 @@
       <return type-id='type-id-403'/>
     </function-decl>
     <!-- typedef typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, void*)* mbsrtowcs_f -->
-    <typedef-decl name='mbsrtowcs_f' type-id='type-id-812' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1' id='type-id-991'/>
+    <typedef-decl name='mbsrtowcs_f' type-id='type-id-851' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1' id='type-id-991'/>
     <!-- SIZE_T __interceptor_mbsnrtowcs(wchar_t*, const char**, SIZE_T, SIZE_T, void*) -->
     <function-decl name='__interceptor_mbsnrtowcs' mangled-name='__interceptor_mbsnrtowcs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mbsnrtowcs'>
       <!-- parameter of type 'wchar_t*' -->
@@ -13510,7 +13510,7 @@
       <return type-id='type-id-403'/>
     </function-decl>
     <!-- typedef typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, typedef SIZE_T, void*)* mbsnrtowcs_f -->
-    <typedef-decl name='mbsnrtowcs_f' type-id='type-id-810' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1' id='type-id-992'/>
+    <typedef-decl name='mbsnrtowcs_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1' id='type-id-992'/>
     <!-- SIZE_T __interceptor_wcstombs(char*, const wchar_t*, SIZE_T) -->
     <function-decl name='__interceptor_wcstombs' mangled-name='__interceptor_wcstombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcstombs'>
       <!-- parameter of type 'char*' -->
@@ -13523,7 +13523,7 @@
       <return type-id='type-id-403'/>
     </function-decl>
     <!-- typedef typedef SIZE_T (char*, const wchar_t*, typedef SIZE_T)* wcstombs_f -->
-    <typedef-decl name='wcstombs_f' type-id='type-id-804' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' id='type-id-993'/>
+    <typedef-decl name='wcstombs_f' type-id='type-id-833' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' id='type-id-993'/>
     <!-- SIZE_T __interceptor_wcsrtombs(char*, const wchar_t**, SIZE_T, void*) -->
     <function-decl name='__interceptor_wcsrtombs' mangled-name='__interceptor_wcsrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsrtombs'>
       <!-- parameter of type 'char*' -->
@@ -13538,7 +13538,7 @@
       <return type-id='type-id-403'/>
     </function-decl>
     <!-- typedef typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, void*)* wcsrtombs_f -->
-    <typedef-decl name='wcsrtombs_f' type-id='type-id-802' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' id='type-id-994'/>
+    <typedef-decl name='wcsrtombs_f' type-id='type-id-831' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' id='type-id-994'/>
     <!-- SIZE_T __interceptor_wcsnrtombs(char*, const wchar_t**, SIZE_T, SIZE_T, void*) -->
     <function-decl name='__interceptor_wcsnrtombs' mangled-name='__interceptor_wcsnrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsnrtombs'>
       <!-- parameter of type 'char*' -->
@@ -13555,7 +13555,7 @@
       <return type-id='type-id-403'/>
     </function-decl>
     <!-- typedef typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, typedef SIZE_T, void*)* wcsnrtombs_f -->
-    <typedef-decl name='wcsnrtombs_f' type-id='type-id-800' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' id='type-id-995'/>
+    <typedef-decl name='wcsnrtombs_f' type-id='type-id-829' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' id='type-id-995'/>
     <!-- int __interceptor_tcgetattr(int, void*) -->
     <function-decl name='__interceptor_tcgetattr' mangled-name='__interceptor_tcgetattr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tcgetattr'>
       <!-- parameter of type 'int' -->
@@ -13599,7 +13599,7 @@
       <return type-id='type-id-403'/>
     </function-decl>
     <!-- typedef typedef SIZE_T (int, char*, typedef SIZE_T)* confstr_f -->
-    <typedef-decl name='confstr_f' type-id='type-id-806' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' id='type-id-999'/>
+    <typedef-decl name='confstr_f' type-id='type-id-837' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' id='type-id-999'/>
     <!-- int __interceptor_sched_getaffinity(int, SIZE_T, void*) -->
     <function-decl name='__interceptor_sched_getaffinity' mangled-name='__interceptor_sched_getaffinity' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sched_getaffinity'>
       <!-- parameter of type 'int' -->
@@ -14275,7 +14275,7 @@
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- typedef void (double, double*, double*)* sincos_f -->
-    <typedef-decl name='sincos_f' type-id='type-id-859' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1' id='type-id-1059'/>
+    <typedef-decl name='sincos_f' type-id='type-id-857' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1' id='type-id-1059'/>
     <!-- void __interceptor_sincosf(float, float*, float*) -->
     <function-decl name='__interceptor_sincosf' mangled-name='__interceptor_sincosf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sincosf'>
       <!-- parameter of type 'float' -->
@@ -14288,7 +14288,7 @@
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- typedef void (float, float*, float*)* sincosf_f -->
-    <typedef-decl name='sincosf_f' type-id='type-id-861' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' id='type-id-1060'/>
+    <typedef-decl name='sincosf_f' type-id='type-id-859' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' id='type-id-1060'/>
     <!-- void __interceptor_sincosl(long double, long double*, long double*) -->
     <function-decl name='__interceptor_sincosl' mangled-name='__interceptor_sincosl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sincosl'>
       <!-- parameter of type 'long double' -->
@@ -14417,7 +14417,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <!-- parameter of type 'long int*' -->
-      <parameter type-id='type-id-791' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
+      <parameter type-id='type-id-817' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -14435,7 +14435,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (char**, SIZE_T*, void*)* getline_f -->
-    <typedef-decl name='getline_f' type-id='type-id-818' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1' id='type-id-1073'/>
+    <typedef-decl name='getline_f' type-id='type-id-794' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1' id='type-id-1073'/>
     <!-- SSIZE_T __interceptor_getdelim(char**, SIZE_T*, int, void*) -->
     <function-decl name='__interceptor_getdelim' mangled-name='__interceptor_getdelim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getdelim'>
       <!-- parameter of type 'char**' -->
@@ -14450,7 +14450,7 @@
       <return type-id='type-id-898'/>
     </function-decl>
     <!-- typedef typedef SSIZE_T (char**, SIZE_T*, int, void*)* getdelim_f -->
-    <typedef-decl name='getdelim_f' type-id='type-id-816' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' id='type-id-1074'/>
+    <typedef-decl name='getdelim_f' type-id='type-id-792' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' id='type-id-1074'/>
     <!-- SIZE_T __interceptor_iconv(void*, char**, SIZE_T*, char**, SIZE_T*) -->
     <function-decl name='__interceptor_iconv' mangled-name='__interceptor_iconv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_iconv'>
       <!-- parameter of type 'void*' -->
@@ -14467,7 +14467,7 @@
       <return type-id='type-id-403'/>
     </function-decl>
     <!-- typedef typedef SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*)* iconv_f -->
-    <typedef-decl name='iconv_f' type-id='type-id-808' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' id='type-id-1075'/>
+    <typedef-decl name='iconv_f' type-id='type-id-845' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' id='type-id-1075'/>
     <!-- __sanitizer::__sanitizer_clock_t __interceptor_times(void*) -->
     <function-decl name='__interceptor_times' mangled-name='__interceptor_times' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_times'>
       <!-- parameter of type 'void*' -->
@@ -14476,7 +14476,7 @@
       <return type-id='type-id-1222'/>
     </function-decl>
     <!-- typedef typedef __sanitizer::__sanitizer_clock_t (void*)* times_f -->
-    <typedef-decl name='times_f' type-id='type-id-836' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' id='type-id-1076'/>
+    <typedef-decl name='times_f' type-id='type-id-816' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' id='type-id-1076'/>
     <!-- typedef void kernel_sigset_t -->
     <typedef-decl name='kernel_sigset_t' type-id='type-id-24' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='130' column='1' id='type-id-559'/>
     <!-- void __sanitizer_syscall_pre_impl_recvmsg(long int, sanitizer_kernel_msghdr*, long int) -->
@@ -14484,7 +14484,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_msghdr*' -->
-      <parameter type-id='type-id-794' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
+      <parameter type-id='type-id-822' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- void -->
@@ -14497,7 +14497,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_msghdr*' -->
-      <parameter type-id='type-id-794' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
+      <parameter type-id='type-id-822' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='158' column='1'/>
       <!-- void -->
@@ -14508,7 +14508,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_mmsghdr*' -->
-      <parameter type-id='type-id-793' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
+      <parameter type-id='type-id-821' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -14525,7 +14525,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_mmsghdr*' -->
-      <parameter type-id='type-id-793' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
+      <parameter type-id='type-id-821' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -18924,7 +18924,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- void -->
@@ -18937,7 +18937,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1761' column='1'/>
       <!-- void -->
@@ -18948,7 +18948,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- void -->
@@ -18961,7 +18961,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1770' column='1'/>
       <!-- void -->
@@ -18972,7 +18972,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- void -->
@@ -18985,7 +18985,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1779' column='1'/>
       <!-- void -->
@@ -18996,7 +18996,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19011,7 +19011,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1790' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19024,7 +19024,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1798' column='1'/>
       <!-- void -->
@@ -19037,7 +19037,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1801' column='1'/>
       <!-- void -->
@@ -19048,7 +19048,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1809' column='1'/>
       <!-- void -->
@@ -19061,7 +19061,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1812' column='1'/>
       <!-- void -->
@@ -19106,7 +19106,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
+      <parameter type-id='type-id-823' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <!-- void -->
@@ -19125,7 +19125,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
+      <parameter type-id='type-id-823' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <!-- void -->
@@ -19220,7 +19220,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
+      <parameter type-id='type-id-823' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <!-- void -->
@@ -19239,7 +19239,7 @@
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-795' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
+      <parameter type-id='type-id-823' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <!-- void -->
@@ -23074,7 +23074,7 @@
       <return type-id='type-id-160'/>
     </function-decl>
     <!-- typedef unsigned int (unsigned int)* sleep_f -->
-    <typedef-decl name='sleep_f' type-id='type-id-853' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' id='type-id-1077'/>
+    <typedef-decl name='sleep_f' type-id='type-id-827' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' id='type-id-1077'/>
     <!-- int __interceptor_usleep(long_t) -->
     <function-decl name='__interceptor_usleep' mangled-name='__interceptor_usleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_usleep'>
       <!-- parameter of type 'typedef long_t' -->
@@ -23194,7 +23194,7 @@
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- typedef void (__sanitizer::uptr*, int)* longjmp_f -->
-    <typedef-decl name='longjmp_f' type-id='type-id-857' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' id='type-id-1089'/>
+    <typedef-decl name='longjmp_f' type-id='type-id-855' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' id='type-id-1089'/>
     <!-- void __interceptor_siglongjmp(__sanitizer::uptr*, int) -->
     <function-decl name='__interceptor_siglongjmp' mangled-name='__interceptor_siglongjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_siglongjmp'>
       <!-- parameter of type '__sanitizer::uptr*' -->
@@ -23205,7 +23205,7 @@
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- typedef void (__sanitizer::uptr*, int)* siglongjmp_f -->
-    <typedef-decl name='siglongjmp_f' type-id='type-id-857' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' id='type-id-1090'/>
+    <typedef-decl name='siglongjmp_f' type-id='type-id-855' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' id='type-id-1090'/>
     <!-- void* __interceptor_malloc(__sanitizer::uptr) -->
     <function-decl name='__interceptor_malloc' mangled-name='__interceptor_malloc' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='475' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_malloc'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -23274,7 +23274,7 @@
       <return type-id='type-id-91'/>
     </function-decl>
     <!-- typedef typedef __sanitizer::uptr (void*)* malloc_usable_size_f -->
-    <typedef-decl name='malloc_usable_size_f' type-id='type-id-842' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='541' column='1' id='type-id-1097'/>
+    <typedef-decl name='malloc_usable_size_f' type-id='type-id-843' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='541' column='1' id='type-id-1097'/>
     <!-- void* operator new(__sanitizer::uptr) -->
     <function-decl name='operator new' mangled-name='_Znwm' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znwm'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -23347,7 +23347,7 @@
       <return type-id='type-id-91'/>
     </function-decl>
     <!-- typedef typedef __sanitizer::uptr (const char*)* strlen_f -->
-    <typedef-decl name='strlen_f' type-id='type-id-838' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='613' column='1' id='type-id-1098'/>
+    <typedef-decl name='strlen_f' type-id='type-id-835' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='613' column='1' id='type-id-1098'/>
     <!-- void* __interceptor_memset(void*, int, __sanitizer::uptr) -->
     <function-decl name='__interceptor_memset' mangled-name='__interceptor_memset' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_memset'>
       <!-- parameter of type 'void*' -->
@@ -24372,7 +24372,7 @@
       <return type-id='type-id-1231'/>
     </function-decl>
     <!-- typedef typedef long_t (int, void*, typedef long_t, int)* send_f -->
-    <typedef-decl name='send_f' type-id='type-id-849' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' id='type-id-1188'/>
+    <typedef-decl name='send_f' type-id='type-id-814' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' id='type-id-1188'/>
     <!-- long_t __interceptor_sendmsg(int, void*, int) -->
     <function-decl name='__interceptor_sendmsg' mangled-name='__interceptor_sendmsg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sendmsg'>
       <!-- parameter of type 'int' -->
@@ -24385,7 +24385,7 @@
       <return type-id='type-id-1231'/>
     </function-decl>
     <!-- typedef typedef long_t (int, void*, int)* sendmsg_f -->
-    <typedef-decl name='sendmsg_f' type-id='type-id-847' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' id='type-id-1189'/>
+    <typedef-decl name='sendmsg_f' type-id='type-id-804' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' id='type-id-1189'/>
     <!-- long_t __interceptor_recv(int, void*, long_t, int) -->
     <function-decl name='__interceptor_recv' mangled-name='__interceptor_recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recv'>
       <!-- parameter of type 'int' -->
@@ -24400,7 +24400,7 @@
       <return type-id='type-id-1231'/>
     </function-decl>
     <!-- typedef typedef long_t (int, void*, typedef long_t, int)* recv_f -->
-    <typedef-decl name='recv_f' type-id='type-id-849' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' id='type-id-1190'/>
+    <typedef-decl name='recv_f' type-id='type-id-814' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' id='type-id-1190'/>
     <!-- int __interceptor_unlink(char*) -->
     <function-decl name='__interceptor_unlink' mangled-name='__interceptor_unlink' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_unlink'>
       <!-- parameter of type 'char*' -->
@@ -24457,7 +24457,7 @@
       <return type-id='type-id-91'/>
     </function-decl>
     <!-- typedef typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* fread_f -->
-    <typedef-decl name='fread_f' type-id='type-id-844' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1554' column='1' id='type-id-1195'/>
+    <typedef-decl name='fread_f' type-id='type-id-847' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1554' column='1' id='type-id-1195'/>
     <!-- __sanitizer::uptr __interceptor_fwrite(void*, __sanitizer::uptr, __sanitizer::uptr, void*) -->
     <function-decl name='__interceptor_fwrite' mangled-name='__interceptor_fwrite' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fwrite'>
       <!-- parameter of type 'void*' -->
@@ -24472,7 +24472,7 @@
       <return type-id='type-id-91'/>
     </function-decl>
     <!-- typedef typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* fwrite_f -->
-    <typedef-decl name='fwrite_f' type-id='type-id-844' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' id='type-id-1196'/>
+    <typedef-decl name='fwrite_f' type-id='type-id-847' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' id='type-id-1196'/>
     <!-- int __interceptor_fflush(void*) -->
     <function-decl name='__interceptor_fflush' mangled-name='__interceptor_fflush' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fflush'>
       <!-- parameter of type 'void*' -->
@@ -24553,9 +24553,9 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-796' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-824' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-796' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-824' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -24571,7 +24571,7 @@
       <return type-id='type-id-388'/>
     </function-decl>
     <!-- typedef typedef sighandler_t (int, typedef sighandler_t)* signal_f -->
-    <typedef-decl name='signal_f' type-id='type-id-851' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' id='type-id-1205'/>
+    <typedef-decl name='signal_f' type-id='type-id-861' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' id='type-id-1205'/>
     <!-- int __interceptor_sigsuspend(const __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigsuspend' mangled-name='__interceptor_sigsuspend' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsuspend'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
@@ -25420,7 +25420,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap'/>
+      <parameter type-id='type-id-825' name='ap'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-type>
@@ -25459,7 +25459,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap'/>
+      <parameter type-id='type-id-825' name='ap'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-type>
@@ -25670,9 +25670,9 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='sig'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-796' name='act'/>
+      <parameter type-id='type-id-824' name='act'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-796' name='old'/>
+      <parameter type-id='type-id-824' name='old'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-type>
@@ -25933,7 +25933,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='format'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-845' name='ap'/>
+      <parameter type-id='type-id-825' name='ap'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-type>
@@ -26011,7 +26011,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='buffer'/>
       <!-- parameter of type 'long int*' -->
-      <parameter type-id='type-id-791' name='result'/>
+      <parameter type-id='type-id-817' name='result'/>
       <!-- int -->
       <return type-id='type-id-4'/>
     </function-type>
@@ -26168,123 +26168,8 @@
       <!-- long double -->
       <return type-id='type-id-361'/>
     </function-type>
-    <!-- INTMAX_T (const char*, char**, int) -->
-    <function-type size-in-bits='64' id='type-id-797'>
-      <!-- parameter of type 'const char*' -->
-      <parameter type-id='type-id-2' name='nptr'/>
-      <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-530' name='endptr'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-4' name='base'/>
-      <!-- typedef INTMAX_T -->
-      <return type-id='type-id-900'/>
-    </function-type>
-    <!-- SIZE_T (char*, const wchar_t**, SIZE_T, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-799'>
-      <!-- parameter of type 'char*' -->
-      <parameter type-id='type-id-25' name='dest'/>
-      <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-569' name='src'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='nms'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='len'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-1' name='ps'/>
-      <!-- typedef SIZE_T -->
-      <return type-id='type-id-403'/>
-    </function-type>
-    <!-- SIZE_T (char*, const wchar_t**, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-801'>
-      <!-- parameter of type 'char*' -->
-      <parameter type-id='type-id-25' name='dest'/>
-      <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-569' name='src'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='len'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-1' name='ps'/>
-      <!-- typedef SIZE_T -->
-      <return type-id='type-id-403'/>
-    </function-type>
-    <!-- SIZE_T (char*, const wchar_t*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-803'>
-      <!-- parameter of type 'char*' -->
-      <parameter type-id='type-id-25' name='dest'/>
-      <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-568' name='src'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='len'/>
-      <!-- typedef SIZE_T -->
-      <return type-id='type-id-403'/>
-    </function-type>
-    <!-- SIZE_T (int, char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-805'>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-4' name='name'/>
-      <!-- parameter of type 'char*' -->
-      <parameter type-id='type-id-25' name='buf'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='len'/>
-      <!-- typedef SIZE_T -->
-      <return type-id='type-id-403'/>
-    </function-type>
-    <!-- SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*) -->
-    <function-type size-in-bits='64' id='type-id-807'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-1' name='cd'/>
-      <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-530' name='inbuf'/>
-      <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-404' name='inbytesleft'/>
-      <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-530' name='outbuf'/>
-      <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-404' name='outbytesleft'/>
-      <!-- typedef SIZE_T -->
-      <return type-id='type-id-403'/>
-    </function-type>
-    <!-- SIZE_T (wchar_t*, const char**, SIZE_T, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-809'>
-      <!-- parameter of type 'wchar_t*' -->
-      <parameter type-id='type-id-896' name='dest'/>
-      <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-343' name='src'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='nms'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='len'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-1' name='ps'/>
-      <!-- typedef SIZE_T -->
-      <return type-id='type-id-403'/>
-    </function-type>
-    <!-- SIZE_T (wchar_t*, const char**, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-811'>
-      <!-- parameter of type 'wchar_t*' -->
-      <parameter type-id='type-id-896' name='dest'/>
-      <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-343' name='src'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='len'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-1' name='ps'/>
-      <!-- typedef SIZE_T -->
-      <return type-id='type-id-403'/>
-    </function-type>
-    <!-- SIZE_T (wchar_t*, const char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-813'>
-      <!-- parameter of type 'wchar_t*' -->
-      <parameter type-id='type-id-896' name='dest'/>
-      <!-- parameter of type 'const char*' -->
-      <parameter type-id='type-id-2' name='src'/>
-      <!-- parameter of type 'typedef SIZE_T' -->
-      <parameter type-id='type-id-403' name='len'/>
-      <!-- typedef SIZE_T -->
-      <return type-id='type-id-403'/>
-    </function-type>
     <!-- SSIZE_T (char**, SIZE_T*, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-815'>
+    <function-type size-in-bits='64' id='type-id-791'>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-530' name='lineptr'/>
       <!-- parameter of type 'SIZE_T*' -->
@@ -26297,7 +26182,7 @@
       <return type-id='type-id-898'/>
     </function-type>
     <!-- SSIZE_T (char**, SIZE_T*, void*) -->
-    <function-type size-in-bits='64' id='type-id-817'>
+    <function-type size-in-bits='64' id='type-id-793'>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-530' name='lineptr'/>
       <!-- parameter of type 'SIZE_T*' -->
@@ -26308,7 +26193,7 @@
       <return type-id='type-id-898'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int) -->
-    <function-type size-in-bits='64' id='type-id-819'>
+    <function-type size-in-bits='64' id='type-id-795'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
@@ -26319,7 +26204,7 @@
       <return type-id='type-id-898'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
-    <function-type size-in-bits='64' id='type-id-821'>
+    <function-type size-in-bits='64' id='type-id-797'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
@@ -26332,7 +26217,7 @@
       <return type-id='type-id-898'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
-    <function-type size-in-bits='64' id='type-id-823'>
+    <function-type size-in-bits='64' id='type-id-799'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
@@ -26345,7 +26230,7 @@
       <return type-id='type-id-898'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int) -->
-    <function-type size-in-bits='64' id='type-id-825'>
+    <function-type size-in-bits='64' id='type-id-801'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_msghdr*' -->
@@ -26355,8 +26240,19 @@
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-898'/>
     </function-type>
+    <!-- long_t (int, void*, int) -->
+    <function-type size-in-bits='64' id='type-id-803'>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-4' name='fd'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-1' name='msg'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-4' name='flags'/>
+      <!-- typedef long_t -->
+      <return type-id='type-id-1231'/>
+    </function-type>
     <!-- SSIZE_T (int, void*, OFF64_T, OFF64_T) -->
-    <function-type size-in-bits='64' id='type-id-827'>
+    <function-type size-in-bits='64' id='type-id-805'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26369,7 +26265,7 @@
       <return type-id='type-id-898'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-829'>
+    <function-type size-in-bits='64' id='type-id-807'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26380,7 +26276,7 @@
       <return type-id='type-id-898'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T, OFF64_T) -->
-    <function-type size-in-bits='64' id='type-id-831'>
+    <function-type size-in-bits='64' id='type-id-809'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26393,7 +26289,7 @@
       <return type-id='type-id-898'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T, OFF_T) -->
-    <function-type size-in-bits='64' id='type-id-833'>
+    <function-type size-in-bits='64' id='type-id-811'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26405,15 +26301,96 @@
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-898'/>
     </function-type>
+    <!-- long_t (int, void*, long_t, int) -->
+    <function-type size-in-bits='64' id='type-id-813'>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-4' name='fd'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-1' name='buf'/>
+      <!-- parameter of type 'typedef long_t' -->
+      <parameter type-id='type-id-1231' name='len'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-4' name='flags'/>
+      <!-- typedef long_t -->
+      <return type-id='type-id-1231'/>
+    </function-type>
     <!-- __sanitizer::__sanitizer_clock_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-835'>
+    <function-type size-in-bits='64' id='type-id-815'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='tms'/>
       <!-- typedef __sanitizer::__sanitizer_clock_t -->
       <return type-id='type-id-1222'/>
     </function-type>
+    <!-- INTMAX_T (const char*, char**, int) -->
+    <function-type size-in-bits='64' id='type-id-818'>
+      <!-- parameter of type 'const char*' -->
+      <parameter type-id='type-id-2' name='nptr'/>
+      <!-- parameter of type 'char**' -->
+      <parameter type-id='type-id-530' name='endptr'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-4' name='base'/>
+      <!-- typedef INTMAX_T -->
+      <return type-id='type-id-900'/>
+    </function-type>
+    <!-- unsigned int (unsigned int) -->
+    <function-type size-in-bits='64' id='type-id-826'>
+      <!-- parameter of type 'unsigned int' -->
+      <parameter type-id='type-id-160' name='sec'/>
+      <!-- unsigned int -->
+      <return type-id='type-id-160'/>
+    </function-type>
+    <!-- SIZE_T (char*, const wchar_t**, SIZE_T, SIZE_T, void*) -->
+    <function-type size-in-bits='64' id='type-id-828'>
+      <!-- parameter of type 'char*' -->
+      <parameter type-id='type-id-25' name='dest'/>
+      <!-- parameter of type 'const wchar_t**' -->
+      <parameter type-id='type-id-569' name='src'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='nms'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='len'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-1' name='ps'/>
+      <!-- typedef SIZE_T -->
+      <return type-id='type-id-403'/>
+    </function-type>
+    <!-- SIZE_T (char*, const wchar_t**, SIZE_T, void*) -->
+    <function-type size-in-bits='64' id='type-id-830'>
+      <!-- parameter of type 'char*' -->
+      <parameter type-id='type-id-25' name='dest'/>
+      <!-- parameter of type 'const wchar_t**' -->
+      <parameter type-id='type-id-569' name='src'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='len'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-1' name='ps'/>
+      <!-- typedef SIZE_T -->
+      <return type-id='type-id-403'/>
+    </function-type>
+    <!-- SIZE_T (char*, const wchar_t*, SIZE_T) -->
+    <function-type size-in-bits='64' id='type-id-832'>
+      <!-- parameter of type 'char*' -->
+      <parameter type-id='type-id-25' name='dest'/>
+      <!-- parameter of type 'const wchar_t*' -->
+      <parameter type-id='type-id-568' name='src'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='len'/>
+      <!-- typedef SIZE_T -->
+      <return type-id='type-id-403'/>
+    </function-type>
+    <!-- SIZE_T (int, char*, SIZE_T) -->
+    <function-type size-in-bits='64' id='type-id-836'>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-4' name='name'/>
+      <!-- parameter of type 'char*' -->
+      <parameter type-id='type-id-25' name='buf'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='len'/>
+      <!-- typedef SIZE_T -->
+      <return type-id='type-id-403'/>
+    </function-type>
     <!-- __sanitizer::uptr (int, int, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-839'>
+    <function-type size-in-bits='64' id='type-id-838'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='request'/>
       <!-- parameter of type 'int' -->
@@ -26425,15 +26402,37 @@
       <!-- typedef __sanitizer::uptr -->
       <return type-id='type-id-91'/>
     </function-type>
+    <!-- unsigned long int (unsigned long int*) -->
+    <function-type size-in-bits='64' id='type-id-840'>
+      <!-- parameter of type 'unsigned long int*' -->
+      <parameter type-id='type-id-127' name='t'/>
+      <!-- unsigned long int -->
+      <return type-id='type-id-105'/>
+    </function-type>
     <!-- __sanitizer::uptr (void*) -->
-    <function-type size-in-bits='64' id='type-id-841'>
+    <function-type size-in-bits='64' id='type-id-842'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='p'/>
       <!-- typedef __sanitizer::uptr -->
       <return type-id='type-id-91'/>
     </function-type>
+    <!-- SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*) -->
+    <function-type size-in-bits='64' id='type-id-844'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-1' name='cd'/>
+      <!-- parameter of type 'char**' -->
+      <parameter type-id='type-id-530' name='inbuf'/>
+      <!-- parameter of type 'SIZE_T*' -->
+      <parameter type-id='type-id-404' name='inbytesleft'/>
+      <!-- parameter of type 'char**' -->
+      <parameter type-id='type-id-530' name='outbuf'/>
+      <!-- parameter of type 'SIZE_T*' -->
+      <parameter type-id='type-id-404' name='outbytesleft'/>
+      <!-- typedef SIZE_T -->
+      <return type-id='type-id-403'/>
+    </function-type>
     <!-- __sanitizer::uptr (void*, __sanitizer::uptr, __sanitizer::uptr, void*) -->
-    <function-type size-in-bits='64' id='type-id-843'>
+    <function-type size-in-bits='64' id='type-id-846'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -26445,55 +26444,47 @@
       <!-- typedef __sanitizer::uptr -->
       <return type-id='type-id-91'/>
     </function-type>
-    <!-- long_t (int, void*, int) -->
-    <function-type size-in-bits='64' id='type-id-846'>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-4' name='fd'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-1' name='msg'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-4' name='flags'/>
-      <!-- typedef long_t -->
-      <return type-id='type-id-1231'/>
-    </function-type>
-    <!-- long_t (int, void*, long_t, int) -->
+    <!-- SIZE_T (wchar_t*, const char**, SIZE_T, SIZE_T, void*) -->
     <function-type size-in-bits='64' id='type-id-848'>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-4' name='fd'/>
+      <!-- parameter of type 'wchar_t*' -->
+      <parameter type-id='type-id-896' name='dest'/>
+      <!-- parameter of type 'const char**' -->
+      <parameter type-id='type-id-343' name='src'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='nms'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='len'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-1' name='buf'/>
-      <!-- parameter of type 'typedef long_t' -->
-      <parameter type-id='type-id-1231' name='len'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-4' name='flags'/>
-      <!-- typedef long_t -->
-      <return type-id='type-id-1231'/>
+      <parameter type-id='type-id-1' name='ps'/>
+      <!-- typedef SIZE_T -->
+      <return type-id='type-id-403'/>
     </function-type>
-    <!-- sighandler_t (int, sighandler_t) -->
+    <!-- SIZE_T (wchar_t*, const char**, SIZE_T, void*) -->
     <function-type size-in-bits='64' id='type-id-850'>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-4' name='sig'/>
-      <!-- parameter of type 'typedef sighandler_t' -->
-      <parameter type-id='type-id-388' name='h'/>
-      <!-- typedef sighandler_t -->
-      <return type-id='type-id-388'/>
+      <!-- parameter of type 'wchar_t*' -->
+      <parameter type-id='type-id-896' name='dest'/>
+      <!-- parameter of type 'const char**' -->
+      <parameter type-id='type-id-343' name='src'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='len'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-1' name='ps'/>
+      <!-- typedef SIZE_T -->
+      <return type-id='type-id-403'/>
     </function-type>
-    <!-- unsigned int (unsigned int) -->
+    <!-- SIZE_T (wchar_t*, const char*, SIZE_T) -->
     <function-type size-in-bits='64' id='type-id-852'>
-      <!-- parameter of type 'unsigned int' -->
-      <parameter type-id='type-id-160' name='sec'/>
-      <!-- unsigned int -->
-      <return type-id='type-id-160'/>
-    </function-type>
-    <!-- unsigned long int (unsigned long int*) -->
-    <function-type size-in-bits='64' id='type-id-854'>
-      <!-- parameter of type 'unsigned long int*' -->
-      <parameter type-id='type-id-127' name='t'/>
-      <!-- unsigned long int -->
-      <return type-id='type-id-105'/>
+      <!-- parameter of type 'wchar_t*' -->
+      <parameter type-id='type-id-896' name='dest'/>
+      <!-- parameter of type 'const char*' -->
+      <parameter type-id='type-id-2' name='src'/>
+      <!-- parameter of type 'typedef SIZE_T' -->
+      <parameter type-id='type-id-403' name='len'/>
+      <!-- typedef SIZE_T -->
+      <return type-id='type-id-403'/>
     </function-type>
     <!-- void (__sanitizer::uptr*, int) -->
-    <function-type size-in-bits='64' id='type-id-856'>
+    <function-type size-in-bits='64' id='type-id-854'>
       <!-- parameter of type '__sanitizer::uptr*' -->
       <parameter type-id='type-id-221' name='env'/>
       <!-- parameter of type 'int' -->
@@ -26502,7 +26493,7 @@
       <return type-id='type-id-24'/>
     </function-type>
     <!-- void (double, double*, double*) -->
-    <function-type size-in-bits='64' id='type-id-858'>
+    <function-type size-in-bits='64' id='type-id-856'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-356' name='x'/>
       <!-- parameter of type 'double*' -->
@@ -26513,7 +26504,7 @@
       <return type-id='type-id-24'/>
     </function-type>
     <!-- void (float, float*, float*) -->
-    <function-type size-in-bits='64' id='type-id-860'>
+    <function-type size-in-bits='64' id='type-id-858'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-357' name='x'/>
       <!-- parameter of type 'float*' -->
@@ -26523,12 +26514,21 @@
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-type>
+    <!-- sighandler_t (int, sighandler_t) -->
+    <function-type size-in-bits='64' id='type-id-860'>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-4' name='sig'/>
+      <!-- parameter of type 'typedef sighandler_t' -->
+      <parameter type-id='type-id-388' name='h'/>
+      <!-- typedef sighandler_t -->
+      <return type-id='type-id-388'/>
+    </function-type>
     <!-- void (int, my_siginfo_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-862'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'my_siginfo_t*' -->
-      <parameter type-id='type-id-792'/>
+      <parameter type-id='type-id-820'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -26686,7 +26686,7 @@
       <return type-id='type-id-25'/>
     </function-type>
     <!-- __sanitizer::uptr (const char*) -->
-    <function-type size-in-bits='64' id='type-id-837'>
+    <function-type size-in-bits='64' id='type-id-834'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='s'/>
       <!-- typedef __sanitizer::uptr -->

diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index afba709f4a0aae40268fc3cc94e0ef2df1930ca1..5f5f577c5ad7179dba8ccdb5c1a4b8613bed3e0a 100644 (file)
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -2484,14 +2484,12 @@
     <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-151'/>
     <!-- typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
-    <!-- typedef hb_codepoint_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
     <!-- unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
     <!-- unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-157'/>
     <!-- struct hb_font_t -->
-    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-160'>
+    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_font_t::header -->
         <var-decl name='header' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='92' column='1'/>
@@ -2502,11 +2500,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- hb_font_t* hb_font_t::parent -->
-        <var-decl name='parent' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
+        <var-decl name='parent' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- hb_face_t* hb_font_t::face -->
-        <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
+        <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- int hb_font_t::x_scale -->
@@ -2526,7 +2524,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- hb_font_funcs_t* hb_font_t::klass -->
-        <var-decl name='klass' type-id='type-id-163' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
+        <var-decl name='klass' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- void* hb_font_t::user_data -->
@@ -2538,13 +2536,13 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- hb_shaper_data_t hb_font_t::shaper_data -->
-        <var-decl name='shaper_data' type-id='type-id-164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::get_glyph_h_advance(hb_codepoint_t) -->
         <function-decl name='get_glyph_h_advance' mangled-name='_ZN9hb_font_t19get_glyph_h_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- typedef hb_position_t -->
@@ -2555,7 +2553,7 @@
         <!-- hb_bool_t hb_font_t::get_glyph(hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <function-decl name='get_glyph' mangled-name='_ZN9hb_font_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -2570,7 +2568,7 @@
         <!-- hb_bool_t hb_font_t::get_glyph_name(hb_codepoint_t, char*, unsigned int) -->
         <function-decl name='get_glyph_name' mangled-name='_ZN9hb_font_t14get_glyph_nameEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'char*' -->
@@ -2585,7 +2583,7 @@
         <!-- hb_position_t hb_font_t::get_glyph_v_advance(hb_codepoint_t) -->
         <function-decl name='get_glyph_v_advance' mangled-name='_ZN9hb_font_t19get_glyph_v_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- typedef hb_position_t -->
@@ -2596,13 +2594,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_h_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_h_origin' mangled-name='_ZN9hb_font_t18get_glyph_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -2611,13 +2609,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_v_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_v_origin' mangled-name='_ZN9hb_font_t18get_glyph_v_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -2626,7 +2624,7 @@
         <!-- hb_position_t hb_font_t::get_glyph_h_kerning(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='get_glyph_h_kerning' mangled-name='_ZN9hb_font_t19get_glyph_h_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -2639,7 +2637,7 @@
         <!-- hb_position_t hb_font_t::get_glyph_v_kerning(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='get_glyph_v_kerning' mangled-name='_ZN9hb_font_t19get_glyph_v_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -2652,15 +2650,15 @@
         <!-- hb_bool_t hb_font_t::get_glyph_contour_point(hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_contour_point' mangled-name='_ZN9hb_font_t23get_glyph_contour_pointEjjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -2669,7 +2667,7 @@
         <!-- hb_position_t hb_font_t::parent_scale_x_position(hb_position_t) -->
         <function-decl name='parent_scale_x_position' mangled-name='_ZN9hb_font_t23parent_scale_x_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
           <parameter type-id='type-id-103'/>
           <!-- typedef hb_position_t -->
@@ -2680,7 +2678,7 @@
         <!-- hb_position_t hb_font_t::parent_scale_y_position(hb_position_t) -->
         <function-decl name='parent_scale_y_position' mangled-name='_ZN9hb_font_t23parent_scale_y_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
           <parameter type-id='type-id-103'/>
           <!-- typedef hb_position_t -->
@@ -2691,13 +2689,13 @@
         <!-- void hb_font_t::guess_v_origin_minus_h_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='guess_v_origin_minus_h_origin' mangled-name='_ZN9hb_font_t29guess_v_origin_minus_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -2706,15 +2704,15 @@
         <!-- void hb_font_t::subtract_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='subtract_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t35subtract_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -2723,7 +2721,7 @@
         <!-- hb_bool_t hb_font_t::get_glyph_contour_point_for_origin(hb_codepoint_t, unsigned int, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_contour_point_for_origin' mangled-name='_ZN9hb_font_t34get_glyph_contour_point_for_originEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'unsigned int' -->
@@ -2731,9 +2729,9 @@
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -2742,15 +2740,15 @@
         <!-- void hb_font_t::add_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='add_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30add_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -2759,7 +2757,7 @@
         <!-- void hb_font_t::get_glyph_kerning_for_direction(hb_codepoint_t, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_kerning_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_kerning_for_directionEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -2767,9 +2765,9 @@
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -2778,15 +2776,15 @@
         <!-- void hb_font_t::get_glyph_advance_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_advance_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_advance_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -2795,11 +2793,11 @@
         <!-- void hb_font_t::parent_scale_distance(hb_position_t*, hb_position_t*) -->
         <function-decl name='parent_scale_distance' mangled-name='_ZN9hb_font_t21parent_scale_distanceEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -2808,13 +2806,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_extents_for_origin(hb_codepoint_t, hb_direction_t, hb_glyph_extents_t*) -->
         <function-decl name='get_glyph_extents_for_origin' mangled-name='_ZN9hb_font_t28get_glyph_extents_for_originEj14hb_direction_tP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_glyph_extents_t*' -->
-          <parameter type-id='type-id-166'/>
+          <parameter type-id='type-id-164'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -2823,7 +2821,7 @@
         <!-- hb_bool_t hb_font_t::glyph_from_string(const char*, int, hb_codepoint_t*) -->
         <function-decl name='glyph_from_string' mangled-name='_ZN9hb_font_t17glyph_from_stringEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='375' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
@@ -2838,7 +2836,7 @@
         <!-- void hb_font_t::glyph_to_string(hb_codepoint_t, char*, unsigned int) -->
         <function-decl name='glyph_to_string' mangled-name='_ZN9hb_font_t15glyph_to_stringEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'char*' -->
@@ -2853,15 +2851,15 @@
         <!-- void hb_font_t::get_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30get_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -2870,7 +2868,7 @@
         <!-- hb_bool_t hb_font_t::get_glyph_from_name(const char*, int, hb_codepoint_t*) -->
         <function-decl name='get_glyph_from_name' mangled-name='_ZN9hb_font_t19get_glyph_from_nameEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
@@ -2885,11 +2883,11 @@
         <!-- void hb_font_t::parent_scale_position(hb_position_t*, hb_position_t*) -->
         <function-decl name='parent_scale_position' mangled-name='_ZN9hb_font_t21parent_scale_positionEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -2898,7 +2896,7 @@
         <!-- hb_position_t hb_font_t::parent_scale_x_distance(hb_position_t) -->
         <function-decl name='parent_scale_x_distance' mangled-name='_ZN9hb_font_t23parent_scale_x_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
           <parameter type-id='type-id-103'/>
           <!-- typedef hb_position_t -->
@@ -2909,7 +2907,7 @@
         <!-- hb_position_t hb_font_t::parent_scale_y_distance(hb_position_t) -->
         <function-decl name='parent_scale_y_distance' mangled-name='_ZN9hb_font_t23parent_scale_y_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
           <parameter type-id='type-id-103'/>
           <!-- typedef hb_position_t -->
@@ -2920,11 +2918,11 @@
         <!-- hb_bool_t hb_font_t::get_glyph_extents(hb_codepoint_t, hb_glyph_extents_t*) -->
         <function-decl name='get_glyph_extents' mangled-name='_ZN9hb_font_t17get_glyph_extentsEjP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'hb_glyph_extents_t*' -->
-          <parameter type-id='type-id-166'/>
+          <parameter type-id='type-id-164'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -2933,7 +2931,7 @@
         <!-- hb_position_t hb_font_t::em_scale(int16_t, int) -->
         <function-decl name='em_scale' mangled-name='_ZN9hb_font_t8em_scaleEsi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
           <parameter type-id='type-id-67'/>
           <!-- parameter of type 'int' -->
@@ -2946,7 +2944,7 @@
         <!-- hb_position_t hb_font_t::em_scale_y(int16_t) -->
         <function-decl name='em_scale_y' mangled-name='_ZN9hb_font_t10em_scale_yEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
           <parameter type-id='type-id-67'/>
           <!-- typedef hb_position_t -->
@@ -2957,7 +2955,7 @@
         <!-- hb_position_t hb_font_t::em_scale_x(int16_t) -->
         <function-decl name='em_scale_x' mangled-name='_ZN9hb_font_t10em_scale_xEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
           <parameter type-id='type-id-67'/>
           <!-- typedef hb_position_t -->
@@ -2968,7 +2966,7 @@
         <!-- hb_bool_t hb_font_t::has_glyph(hb_codepoint_t) -->
         <function-decl name='has_glyph' mangled-name='_ZN9hb_font_t9has_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- typedef hb_bool_t -->
@@ -2980,7 +2978,7 @@
     <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-133'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char hb_language_impl_t::s[1] -->
-        <var-decl name='s' type-id='type-id-167' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
+        <var-decl name='s' type-id='type-id-165' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
       </data-member>
     </class-decl>
     <!-- const char** hb_buffer_serialize_list_formats() -->
@@ -3063,17 +3061,17 @@
     <!-- typedef const hb_language_impl_t* hb_language_t -->
     <typedef-decl name='hb_language_t' type-id='type-id-135' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='137' column='1' id='type-id-107'/>
     <!-- typedef hb_font_t hb_font_t -->
-    <typedef-decl name='hb_font_t' type-id='type-id-160' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='40' column='1' id='type-id-146'/>
+    <typedef-decl name='hb_font_t' type-id='type-id-158' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='40' column='1' id='type-id-146'/>
     <!-- typedef hb_unicode_funcs_t hb_unicode_funcs_t -->
     <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-112' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-149'/>
     <!-- typedef enum hb_unicode_combining_class_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_combining_class_func_t -->
     <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-141' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-114'/>
     <!-- typedef unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_eastasian_width_func_t -->
-    <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-159' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-115'/>
+    <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-157' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-115'/>
     <!-- typedef enum hb_unicode_general_category_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_general_category_func_t -->
     <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-143' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-116'/>
     <!-- typedef typedef hb_codepoint_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_mirroring_func_t -->
-    <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-155' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-117'/>
+    <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-157' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-117'/>
     <!-- typedef enum hb_script_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_script_func_t -->
     <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-139' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-118'/>
     <!-- typedef typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_unicode_compose_func_t -->
@@ -3081,7 +3079,7 @@
     <!-- typedef typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*)* hb_unicode_decompose_func_t -->
     <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-151' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-120'/>
     <!-- typedef unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_unicode_decompose_compatibility_func_t -->
-    <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-157' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-121'/>
+    <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-155' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-121'/>
     <!-- typedef signed char int8_t -->
     <typedef-decl name='int8_t' type-id='type-id-73' filepath='/usr/include/stdint.h' line='37' column='1' id='type-id-69'/>
     <!-- typedef short int int16_t -->
@@ -3157,19 +3155,8 @@
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-type>
-    <!-- hb_codepoint_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-154'>
-      <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-84'/>
-      <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-64'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
-      <!-- typedef hb_codepoint_t -->
-      <return type-id='type-id-64'/>
-    </function-type>
     <!-- unsigned int (hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-156'>
+    <function-type size-in-bits='64' id='type-id-154'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3182,7 +3169,7 @@
       <return type-id='type-id-12'/>
     </function-type>
     <!-- unsigned int (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-158'>
+    <function-type size-in-bits='64' id='type-id-156'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3198,31 +3185,31 @@
     <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-133'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char hb_language_impl_t::s[1] -->
-        <var-decl name='s' type-id='type-id-167' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
+        <var-decl name='s' type-id='type-id-165' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct hb_utf_t<unsigned int, true> -->
-    <class-decl name='hb_utf_t&lt;unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='32' column='1' id='type-id-168'>
+    <class-decl name='hb_utf_t&lt;unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='32' column='1' id='type-id-166'>
       <member-function access='public' static='yes'>
         <!-- const uint32_t* hb_utf_t<unsigned int, true>::next(const uint32_t*, hb_codepoint_t*, unsigned int) -->
         <function-decl name='next' mangled-name='_ZN8hb_utf_tIjLb1EE4nextEPKjS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint32_t*' -->
-          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-167'/>
           <!-- parameter of type 'const uint32_t*' -->
-          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-167'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- const uint32_t* -->
-          <return type-id='type-id-169'/>
+          <return type-id='type-id-167'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <!-- unsigned int hb_utf_t<unsigned int, true>::strlen() -->
         <function-decl name='strlen' mangled-name='_ZN8hb_utf_tIjLb1EE6strlenEPKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint32_t*' -->
-          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-167'/>
           <!-- unsigned int -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3231,25 +3218,25 @@
         <!-- const uint32_t* hb_utf_t<unsigned int, true>::prev(const uint32_t*, hb_codepoint_t*, unsigned int) -->
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tIjLb1EE4prevEPKjS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint32_t*' -->
-          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-167'/>
           <!-- parameter of type 'const uint32_t*' -->
-          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-167'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- const uint32_t* -->
-          <return type-id='type-id-169'/>
+          <return type-id='type-id-167'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_utf_t<unsigned char, true> -->
-    <class-decl name='hb_utf_t&lt;unsigned char, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='39' column='1' id='type-id-170'>
+    <class-decl name='hb_utf_t&lt;unsigned char, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='39' column='1' id='type-id-168'>
       <member-function access='public' static='yes'>
         <!-- unsigned int hb_utf_t<unsigned char, true>::strlen() -->
         <function-decl name='strlen' mangled-name='_ZN8hb_utf_tIhLb1EE6strlenEPKh' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint8_t*' -->
-          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-169'/>
           <!-- unsigned int -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3258,40 +3245,40 @@
         <!-- const uint8_t* hb_utf_t<unsigned char, true>::prev(const uint8_t*, hb_codepoint_t*, hb_codepoint_t) -->
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tIhLb1EE4prevEPKhS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint8_t*' -->
-          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-169'/>
           <!-- parameter of type 'const uint8_t*' -->
-          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-169'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- const uint8_t* -->
-          <return type-id='type-id-171'/>
+          <return type-id='type-id-169'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <!-- const uint8_t* hb_utf_t<unsigned char, true>::next(const uint8_t*, hb_codepoint_t*, hb_codepoint_t) -->
         <function-decl name='next' mangled-name='_ZN8hb_utf_tIhLb1EE4nextEPKhS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint8_t*' -->
-          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-169'/>
           <!-- parameter of type 'const uint8_t*' -->
-          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-169'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- const uint8_t* -->
-          <return type-id='type-id-171'/>
+          <return type-id='type-id-169'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_utf_t<short unsigned int, true> -->
-    <class-decl name='hb_utf_t&lt;short unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='138' column='1' id='type-id-172'>
+    <class-decl name='hb_utf_t&lt;short unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='138' column='1' id='type-id-170'>
       <member-function access='public' static='yes'>
         <!-- unsigned int hb_utf_t<short unsigned int, true>::strlen() -->
         <function-decl name='strlen' mangled-name='_ZN8hb_utf_tItLb1EE6strlenEPKt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint16_t*' -->
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-171'/>
           <!-- unsigned int -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3300,64 +3287,64 @@
         <!-- const uint16_t* hb_utf_t<short unsigned int, true>::prev(const uint16_t*, hb_codepoint_t*, hb_codepoint_t) -->
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tItLb1EE4prevEPKtS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint16_t*' -->
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-171'/>
           <!-- parameter of type 'const uint16_t*' -->
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-171'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- const uint16_t* -->
-          <return type-id='type-id-173'/>
+          <return type-id='type-id-171'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <!-- const uint16_t* hb_utf_t<short unsigned int, true>::next(const uint16_t*, hb_codepoint_t*, hb_codepoint_t) -->
         <function-decl name='next' mangled-name='_ZN8hb_utf_tItLb1EE4nextEPKtS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'const uint16_t*' -->
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-171'/>
           <!-- parameter of type 'const uint16_t*' -->
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-171'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- const uint16_t* -->
-          <return type-id='type-id-173'/>
+          <return type-id='type-id-171'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- const hb_segment_properties_t -->
-    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-174'/>
+    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-172'/>
     <!-- const hb_segment_properties_t* -->
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
     <!-- const uint16_t -->
-    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-176'/>
+    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-174'/>
     <!-- const uint16_t* -->
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-173'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-171'/>
     <!-- const uint32_t -->
-    <qualified-type-def type-id='type-id-100' const='yes' id='type-id-177'/>
+    <qualified-type-def type-id='type-id-100' const='yes' id='type-id-175'/>
     <!-- const uint32_t* -->
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-167'/>
     <!-- const uint8_t -->
-    <qualified-type-def type-id='type-id-76' const='yes' id='type-id-178'/>
+    <qualified-type-def type-id='type-id-76' const='yes' id='type-id-176'/>
     <!-- const uint8_t* -->
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-171'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-169'/>
     <!-- hb_segment_properties_t* -->
-    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-179'/>
+    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-177'/>
     <!-- hb_bool_t hb_segment_properties_equal(const hb_segment_properties_t*, const hb_segment_properties_t*) -->
     <function-decl name='hb_segment_properties_equal' mangled-name='hb_segment_properties_equal' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_segment_properties_equal'>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
-      <parameter type-id='type-id-175' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='40' column='1'/>
+      <parameter type-id='type-id-173' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='40' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
-      <parameter type-id='type-id-175' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='41' column='1'/>
+      <parameter type-id='type-id-173' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='41' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- unsigned int hb_segment_properties_hash(const hb_segment_properties_t*) -->
     <function-decl name='hb_segment_properties_hash' mangled-name='hb_segment_properties_hash' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_segment_properties_hash'>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
-      <parameter type-id='type-id-175' name='p' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='52' column='1'/>
+      <parameter type-id='type-id-173' name='p' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='52' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
@@ -3494,7 +3481,7 @@
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
-      <parameter type-id='type-id-175' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
+      <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -3503,7 +3490,7 @@
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
       <!-- parameter of type 'hb_segment_properties_t*' -->
-      <parameter type-id='type-id-179' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
+      <parameter type-id='type-id-177' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -3655,7 +3642,7 @@
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
       <!-- parameter of type 'const uint16_t*' -->
-      <parameter type-id='type-id-173' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
+      <parameter type-id='type-id-171' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-9' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1437' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3670,7 +3657,7 @@
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
       <!-- parameter of type 'const uint32_t*' -->
-      <parameter type-id='type-id-169' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
+      <parameter type-id='type-id-167' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-9' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1459' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3705,20 +3692,20 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- char[1] -->
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-180'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-178'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- const char[1] -->
-    <array-type-def dimensions='1' type-id='type-id-46' size-in-bits='8' id='type-id-167'>
+    <array-type-def dimensions='1' type-id='type-id-46' size-in-bits='8' id='type-id-165'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- struct hb_language_item_t -->
-    <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-182'>
+    <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_language_item_t* hb_language_item_t::next -->
-        <var-decl name='next' type-id='type-id-183' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='214' column='1'/>
+        <var-decl name='next' type-id='type-id-181' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='214' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_language_t hb_language_item_t::lang -->
@@ -3728,7 +3715,7 @@
         <!-- void hb_language_item_t::finish() -->
         <function-decl name='finish' mangled-name='_ZN18hb_language_item_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_language_item_t*' -->
-          <parameter type-id='type-id-183' is-artificial='yes'/>
+          <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -3737,7 +3724,7 @@
         <!-- bool hb_language_item_t::operator==(const char*) -->
         <function-decl name='operator==' mangled-name='_ZNK18hb_language_item_teqEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_language_item_t*' -->
-          <parameter type-id='type-id-184' is-artificial='yes'/>
+          <parameter type-id='type-id-182' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-15'/>
           <!-- bool -->
@@ -3748,22 +3735,22 @@
         <!-- hb_language_item_t& hb_language_item_t::operator=(const char*) -->
         <function-decl name='operator=' mangled-name='_ZN18hb_language_item_taSEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_language_item_t*' -->
-          <parameter type-id='type-id-183' is-artificial='yes'/>
+          <parameter type-id='type-id-181' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-15'/>
           <!-- hb_language_item_t& -->
-          <return type-id='type-id-185'/>
+          <return type-id='type-id-183'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- const hb_language_item_t -->
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-186'/>
+    <qualified-type-def type-id='type-id-180' const='yes' id='type-id-184'/>
     <!-- const hb_language_item_t* -->
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-182'/>
     <!-- hb_language_item_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-182' size-in-bits='64' id='type-id-185'/>
+    <reference-type-def kind='lvalue' type-id='type-id-180' size-in-bits='64' id='type-id-183'/>
     <!-- hb_language_item_t* -->
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-181'/>
     <!-- hb_tag_t hb_tag_from_string(const char*, int) -->
     <function-decl name='hb_tag_from_string' mangled-name='hb_tag_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_tag_from_string'>
       <!-- parameter of type 'const char*' -->
@@ -3771,12 +3758,12 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-9' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='70' column='1'/>
       <!-- typedef hb_tag_t -->
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-185'/>
     </function-decl>
     <!-- void hb_tag_to_string(hb_tag_t, char*) -->
     <function-decl name='hb_tag_to_string' mangled-name='hb_tag_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_tag_to_string'>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='98' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='98' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-45' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='98' column='1'/>
       <!-- void -->
@@ -3822,7 +3809,7 @@
     <!-- hb_script_t hb_script_from_iso15924_tag(hb_tag_t) -->
     <function-decl name='hb_script_from_iso15924_tag' mangled-name='hb_script_from_iso15924_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_from_iso15924_tag'>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1'/>
       <!-- enum hb_script_t -->
       <return type-id='type-id-106'/>
     </function-decl>
@@ -3840,7 +3827,7 @@
       <!-- parameter of type 'enum hb_script_t' -->
       <parameter type-id='type-id-106' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1'/>
       <!-- typedef hb_tag_t -->
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-185'/>
     </function-decl>
     <!-- hb_direction_t hb_script_get_horizontal_direction(hb_script_t) -->
     <function-decl name='hb_script_get_horizontal_direction' mangled-name='hb_script_get_horizontal_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_get_horizontal_direction'>
@@ -3877,36 +3864,36 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- typedef uint32_t hb_tag_t -->
-    <typedef-decl name='hb_tag_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-187'/>
+    <typedef-decl name='hb_tag_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-185'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-188' id='type-id-189'>
+    <array-type-def dimensions='1' type-id='type-id-186' id='type-id-187'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- TableRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-190' id='type-id-191'>
+    <array-type-def dimensions='1' type-id='type-id-188' id='type-id-189'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- uint8_t[2] -->
-    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='16' id='type-id-192'>
+    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='16' id='type-id-190'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
     <!-- struct hb_face_t -->
-    <class-decl name='hb_face_t' size-in-bits='1472' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='43' column='1' id='type-id-193'>
+    <class-decl name='hb_face_t' size-in-bits='1472' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='43' column='1' id='type-id-191'>
       <member-type access='public'>
         <!-- struct hb_face_t::plan_node_t -->
-        <class-decl name='plan_node_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='59' column='1' id='type-id-194'>
+        <class-decl name='plan_node_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='59' column='1' id='type-id-192'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- hb_shape_plan_t* hb_face_t::plan_node_t::shape_plan -->
-            <var-decl name='shape_plan' type-id='type-id-195' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='60' column='1'/>
+            <var-decl name='shape_plan' type-id='type-id-193' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='60' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- hb_face_t::plan_node_t* hb_face_t::plan_node_t::next -->
-            <var-decl name='next' type-id='type-id-196' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='61' column='1'/>
+            <var-decl name='next' type-id='type-id-194' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='61' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -3920,7 +3907,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- hb_reference_table_func_t hb_face_t::reference_table_func -->
-        <var-decl name='reference_table_func' type-id='type-id-197' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='49' column='1'/>
+        <var-decl name='reference_table_func' type-id='type-id-195' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- void* hb_face_t::user_data -->
@@ -3944,17 +3931,17 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- hb_shaper_data_t hb_face_t::shaper_data -->
-        <var-decl name='shaper_data' type-id='type-id-164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='57' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- hb_face_t::plan_node_t* hb_face_t::shape_plans -->
-        <var-decl name='shape_plans' type-id='type-id-196' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='62' column='1'/>
+        <var-decl name='shape_plans' type-id='type-id-194' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='62' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- unsigned int hb_face_t::get_num_glyphs() -->
         <function-decl name='get_num_glyphs' mangled-name='_ZNK9hb_face_t14get_num_glyphsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_face_t*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <!-- unsigned int -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3963,7 +3950,7 @@
         <!-- unsigned int hb_face_t::get_upem() -->
         <function-decl name='get_upem' mangled-name='_ZNK9hb_face_t8get_upemEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_face_t*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <!-- unsigned int -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3972,9 +3959,9 @@
         <!-- hb_blob_t* hb_face_t::reference_table(hb_tag_t) -->
         <function-decl name='reference_table' mangled-name='_ZNK9hb_face_t15reference_tableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_face_t*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- hb_blob_t* -->
           <return type-id='type-id-57'/>
         </function-decl>
@@ -3983,7 +3970,7 @@
         <!-- void hb_face_t::load_num_glyphs() -->
         <function-decl name='load_num_glyphs' mangled-name='_ZNK9hb_face_t15load_num_glyphsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_face_t*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -3992,66 +3979,66 @@
         <!-- void hb_face_t::load_upem() -->
         <function-decl name='load_upem' mangled-name='_ZNK9hb_face_t9load_upemEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_face_t*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_font_funcs_t -->
-    <class-decl name='hb_font_funcs_t' size-in-bits='3072' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='58' column='1' id='type-id-199'>
+    <class-decl name='hb_font_funcs_t' size-in-bits='3072' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='58' column='1' id='type-id-197'>
       <member-type access='public'>
         <!-- struct {hb_font_get_glyph_func_t glyph; hb_font_get_glyph_h_advance_func_t glyph_h_advance; hb_font_get_glyph_v_advance_func_t glyph_v_advance; hb_font_get_glyph_h_origin_func_t glyph_h_origin; hb_font_get_glyph_v_origin_func_t glyph_v_origin; hb_font_get_glyph_h_kerning_func_t glyph_h_kerning; hb_font_get_glyph_v_kerning_func_t glyph_v_kerning; hb_font_get_glyph_extents_func_t glyph_extents; hb_font_get_glyph_contour_point_func_t glyph_contour_point; hb_font_get_glyph_name_func_t glyph_name; hb_font_get_glyph_from_name_func_t glyph_from_name;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='66' column='1' id='type-id-200'>
+        <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='66' column='1' id='type-id-198'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- hb_font_get_glyph_func_t glyph -->
-            <var-decl name='glyph' type-id='type-id-201' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph' type-id='type-id-199' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- hb_font_get_glyph_h_advance_func_t glyph_h_advance -->
-            <var-decl name='glyph_h_advance' type-id='type-id-202' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_h_advance' type-id='type-id-200' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- hb_font_get_glyph_v_advance_func_t glyph_v_advance -->
-            <var-decl name='glyph_v_advance' type-id='type-id-203' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_v_advance' type-id='type-id-201' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- hb_font_get_glyph_h_origin_func_t glyph_h_origin -->
-            <var-decl name='glyph_h_origin' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_h_origin' type-id='type-id-202' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
             <!-- hb_font_get_glyph_v_origin_func_t glyph_v_origin -->
-            <var-decl name='glyph_v_origin' type-id='type-id-205' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_v_origin' type-id='type-id-203' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
             <!-- hb_font_get_glyph_h_kerning_func_t glyph_h_kerning -->
-            <var-decl name='glyph_h_kerning' type-id='type-id-206' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_h_kerning' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='384'>
             <!-- hb_font_get_glyph_v_kerning_func_t glyph_v_kerning -->
-            <var-decl name='glyph_v_kerning' type-id='type-id-207' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_v_kerning' type-id='type-id-205' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='448'>
             <!-- hb_font_get_glyph_extents_func_t glyph_extents -->
-            <var-decl name='glyph_extents' type-id='type-id-208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_extents' type-id='type-id-206' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='512'>
             <!-- hb_font_get_glyph_contour_point_func_t glyph_contour_point -->
-            <var-decl name='glyph_contour_point' type-id='type-id-209' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_contour_point' type-id='type-id-207' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='576'>
             <!-- hb_font_get_glyph_name_func_t glyph_name -->
-            <var-decl name='glyph_name' type-id='type-id-210' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_name' type-id='type-id-208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='640'>
             <!-- hb_font_get_glyph_from_name_func_t glyph_from_name -->
-            <var-decl name='glyph_from_name' type-id='type-id-211' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_from_name' type-id='type-id-209' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <member-type access='public'>
         <!-- struct {void* glyph; void* glyph_h_advance; void* glyph_v_advance; void* glyph_h_origin; void* glyph_v_origin; void* glyph_h_kerning; void* glyph_v_kerning; void* glyph_extents; void* glyph_contour_point; void* glyph_name; void* glyph_from_name;} -->
-        <class-decl name='__anonymous_struct__1' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='72' column='1' id='type-id-212'>
+        <class-decl name='__anonymous_struct__1' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='72' column='1' id='type-id-210'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- void* glyph -->
             <var-decl name='glyph' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='74' column='1'/>
@@ -4100,7 +4087,7 @@
       </member-type>
       <member-type access='public'>
         <!-- struct {hb_destroy_func_t glyph; hb_destroy_func_t glyph_h_advance; hb_destroy_func_t glyph_v_advance; hb_destroy_func_t glyph_h_origin; hb_destroy_func_t glyph_v_origin; hb_destroy_func_t glyph_h_kerning; hb_destroy_func_t glyph_v_kerning; hb_destroy_func_t glyph_extents; hb_destroy_func_t glyph_contour_point; hb_destroy_func_t glyph_name; hb_destroy_func_t glyph_from_name;} -->
-        <class-decl name='__anonymous_struct__2' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='78' column='1' id='type-id-213'>
+        <class-decl name='__anonymous_struct__2' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='78' column='1' id='type-id-211'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- hb_destroy_func_t glyph -->
             <var-decl name='glyph' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='80' column='1'/>
@@ -4157,19 +4144,19 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- struct {hb_font_get_glyph_func_t glyph; hb_font_get_glyph_h_advance_func_t glyph_h_advance; hb_font_get_glyph_v_advance_func_t glyph_v_advance; hb_font_get_glyph_h_origin_func_t glyph_h_origin; hb_font_get_glyph_v_origin_func_t glyph_v_origin; hb_font_get_glyph_h_kerning_func_t glyph_h_kerning; hb_font_get_glyph_v_kerning_func_t glyph_v_kerning; hb_font_get_glyph_extents_func_t glyph_extents; hb_font_get_glyph_contour_point_func_t glyph_contour_point; hb_font_get_glyph_name_func_t glyph_name; hb_font_get_glyph_from_name_func_t glyph_from_name;} hb_font_funcs_t::get -->
-        <var-decl name='get' type-id='type-id-200' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='70' column='1'/>
+        <var-decl name='get' type-id='type-id-198' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
         <!-- struct {void* glyph; void* glyph_h_advance; void* glyph_v_advance; void* glyph_h_origin; void* glyph_v_origin; void* glyph_h_kerning; void* glyph_v_kerning; void* glyph_extents; void* glyph_contour_point; void* glyph_name; void* glyph_from_name;} hb_font_funcs_t::user_data -->
-        <var-decl name='user_data' type-id='type-id-212' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='76' column='1'/>
+        <var-decl name='user_data' type-id='type-id-210' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- struct {hb_destroy_func_t glyph; hb_destroy_func_t glyph_h_advance; hb_destroy_func_t glyph_v_advance; hb_destroy_func_t glyph_h_origin; hb_destroy_func_t glyph_v_origin; hb_destroy_func_t glyph_h_kerning; hb_destroy_func_t glyph_v_kerning; hb_destroy_func_t glyph_extents; hb_destroy_func_t glyph_contour_point; hb_destroy_func_t glyph_name; hb_destroy_func_t glyph_from_name;} hb_font_funcs_t::destroy -->
-        <var-decl name='destroy' type-id='type-id-213' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='82' column='1'/>
+        <var-decl name='destroy' type-id='type-id-211' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='82' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct hb_font_t -->
-    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-160'>
+    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_font_t::header -->
         <var-decl name='header' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='92' column='1'/>
@@ -4180,11 +4167,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- hb_font_t* hb_font_t::parent -->
-        <var-decl name='parent' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
+        <var-decl name='parent' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- hb_face_t* hb_font_t::face -->
-        <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
+        <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- int hb_font_t::x_scale -->
@@ -4204,7 +4191,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- hb_font_funcs_t* hb_font_t::klass -->
-        <var-decl name='klass' type-id='type-id-163' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
+        <var-decl name='klass' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- void* hb_font_t::user_data -->
@@ -4216,13 +4203,13 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- hb_shaper_data_t hb_font_t::shaper_data -->
-        <var-decl name='shaper_data' type-id='type-id-164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::get_glyph_h_advance(hb_codepoint_t) -->
         <function-decl name='get_glyph_h_advance' mangled-name='_ZN9hb_font_t19get_glyph_h_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- typedef hb_position_t -->
@@ -4233,7 +4220,7 @@
         <!-- hb_bool_t hb_font_t::get_glyph(hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <function-decl name='get_glyph' mangled-name='_ZN9hb_font_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -4248,7 +4235,7 @@
         <!-- hb_bool_t hb_font_t::get_glyph_name(hb_codepoint_t, char*, unsigned int) -->
         <function-decl name='get_glyph_name' mangled-name='_ZN9hb_font_t14get_glyph_nameEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'char*' -->
@@ -4263,7 +4250,7 @@
         <!-- hb_position_t hb_font_t::get_glyph_v_advance(hb_codepoint_t) -->
         <function-decl name='get_glyph_v_advance' mangled-name='_ZN9hb_font_t19get_glyph_v_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- typedef hb_position_t -->
@@ -4274,13 +4261,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_h_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_h_origin' mangled-name='_ZN9hb_font_t18get_glyph_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -4289,13 +4276,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_v_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_v_origin' mangled-name='_ZN9hb_font_t18get_glyph_v_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -4304,7 +4291,7 @@
         <!-- hb_position_t hb_font_t::get_glyph_h_kerning(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='get_glyph_h_kerning' mangled-name='_ZN9hb_font_t19get_glyph_h_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -4317,7 +4304,7 @@
         <!-- hb_position_t hb_font_t::get_glyph_v_kerning(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='get_glyph_v_kerning' mangled-name='_ZN9hb_font_t19get_glyph_v_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -4330,15 +4317,15 @@
         <!-- hb_bool_t hb_font_t::get_glyph_contour_point(hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_contour_point' mangled-name='_ZN9hb_font_t23get_glyph_contour_pointEjjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -4347,7 +4334,7 @@
         <!-- hb_position_t hb_font_t::parent_scale_x_position(hb_position_t) -->
         <function-decl name='parent_scale_x_position' mangled-name='_ZN9hb_font_t23parent_scale_x_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
           <parameter type-id='type-id-103'/>
           <!-- typedef hb_position_t -->
@@ -4358,7 +4345,7 @@
         <!-- hb_position_t hb_font_t::parent_scale_y_position(hb_position_t) -->
         <function-decl name='parent_scale_y_position' mangled-name='_ZN9hb_font_t23parent_scale_y_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
           <parameter type-id='type-id-103'/>
           <!-- typedef hb_position_t -->
@@ -4369,13 +4356,13 @@
         <!-- void hb_font_t::guess_v_origin_minus_h_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='guess_v_origin_minus_h_origin' mangled-name='_ZN9hb_font_t29guess_v_origin_minus_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -4384,15 +4371,15 @@
         <!-- void hb_font_t::subtract_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='subtract_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t35subtract_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -4401,7 +4388,7 @@
         <!-- hb_bool_t hb_font_t::get_glyph_contour_point_for_origin(hb_codepoint_t, unsigned int, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_contour_point_for_origin' mangled-name='_ZN9hb_font_t34get_glyph_contour_point_for_originEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'unsigned int' -->
@@ -4409,9 +4396,9 @@
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -4420,15 +4407,15 @@
         <!-- void hb_font_t::add_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='add_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30add_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -4437,7 +4424,7 @@
         <!-- void hb_font_t::get_glyph_kerning_for_direction(hb_codepoint_t, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_kerning_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_kerning_for_directionEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -4445,9 +4432,9 @@
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -4456,15 +4443,15 @@
         <!-- void hb_font_t::get_glyph_advance_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_advance_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_advance_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -4473,11 +4460,11 @@
         <!-- void hb_font_t::parent_scale_distance(hb_position_t*, hb_position_t*) -->
         <function-decl name='parent_scale_distance' mangled-name='_ZN9hb_font_t21parent_scale_distanceEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -4486,13 +4473,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_extents_for_origin(hb_codepoint_t, hb_direction_t, hb_glyph_extents_t*) -->
         <function-decl name='get_glyph_extents_for_origin' mangled-name='_ZN9hb_font_t28get_glyph_extents_for_originEj14hb_direction_tP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_glyph_extents_t*' -->
-          <parameter type-id='type-id-166'/>
+          <parameter type-id='type-id-164'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -4501,7 +4488,7 @@
         <!-- hb_bool_t hb_font_t::glyph_from_string(const char*, int, hb_codepoint_t*) -->
         <function-decl name='glyph_from_string' mangled-name='_ZN9hb_font_t17glyph_from_stringEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='375' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
@@ -4516,7 +4503,7 @@
         <!-- void hb_font_t::glyph_to_string(hb_codepoint_t, char*, unsigned int) -->
         <function-decl name='glyph_to_string' mangled-name='_ZN9hb_font_t15glyph_to_stringEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'char*' -->
@@ -4531,15 +4518,15 @@
         <!-- void hb_font_t::get_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30get_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'enum hb_direction_t' -->
           <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -4548,7 +4535,7 @@
         <!-- hb_bool_t hb_font_t::get_glyph_from_name(const char*, int, hb_codepoint_t*) -->
         <function-decl name='get_glyph_from_name' mangled-name='_ZN9hb_font_t19get_glyph_from_nameEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
@@ -4563,11 +4550,11 @@
         <!-- void hb_font_t::parent_scale_position(hb_position_t*, hb_position_t*) -->
         <function-decl name='parent_scale_position' mangled-name='_ZN9hb_font_t21parent_scale_positionEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -4576,7 +4563,7 @@
         <!-- hb_position_t hb_font_t::parent_scale_x_distance(hb_position_t) -->
         <function-decl name='parent_scale_x_distance' mangled-name='_ZN9hb_font_t23parent_scale_x_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
           <parameter type-id='type-id-103'/>
           <!-- typedef hb_position_t -->
@@ -4587,7 +4574,7 @@
         <!-- hb_position_t hb_font_t::parent_scale_y_distance(hb_position_t) -->
         <function-decl name='parent_scale_y_distance' mangled-name='_ZN9hb_font_t23parent_scale_y_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
           <parameter type-id='type-id-103'/>
           <!-- typedef hb_position_t -->
@@ -4598,11 +4585,11 @@
         <!-- hb_bool_t hb_font_t::get_glyph_extents(hb_codepoint_t, hb_glyph_extents_t*) -->
         <function-decl name='get_glyph_extents' mangled-name='_ZN9hb_font_t17get_glyph_extentsEjP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'hb_glyph_extents_t*' -->
-          <parameter type-id='type-id-166'/>
+          <parameter type-id='type-id-164'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-35'/>
         </function-decl>
@@ -4611,7 +4598,7 @@
         <!-- hb_position_t hb_font_t::em_scale(int16_t, int) -->
         <function-decl name='em_scale' mangled-name='_ZN9hb_font_t8em_scaleEsi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
           <parameter type-id='type-id-67'/>
           <!-- parameter of type 'int' -->
@@ -4624,7 +4611,7 @@
         <!-- hb_position_t hb_font_t::em_scale_y(int16_t) -->
         <function-decl name='em_scale_y' mangled-name='_ZN9hb_font_t10em_scale_yEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
           <parameter type-id='type-id-67'/>
           <!-- typedef hb_position_t -->
@@ -4635,7 +4622,7 @@
         <!-- hb_position_t hb_font_t::em_scale_x(int16_t) -->
         <function-decl name='em_scale_x' mangled-name='_ZN9hb_font_t10em_scale_xEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
           <parameter type-id='type-id-67'/>
           <!-- typedef hb_position_t -->
@@ -4646,7 +4633,7 @@
         <!-- hb_bool_t hb_font_t::has_glyph(hb_codepoint_t) -->
         <function-decl name='has_glyph' mangled-name='_ZN9hb_font_t9has_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- typedef hb_bool_t -->
@@ -4655,7 +4642,7 @@
       </member-function>
     </class-decl>
     <!-- struct hb_glyph_extents_t -->
-    <class-decl name='hb_glyph_extents_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='84' column='1' id='type-id-214'>
+    <class-decl name='hb_glyph_extents_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='84' column='1' id='type-id-212'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_position_t hb_glyph_extents_t::x_bearing -->
         <var-decl name='x_bearing' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='85' column='1'/>
@@ -4674,12 +4661,12 @@
       </data-member>
     </class-decl>
     <!-- struct hb_auto_trace_t<0, bool> -->
-    <class-decl name='hb_auto_trace_t&lt;0, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-215'>
+    <class-decl name='hb_auto_trace_t&lt;0, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-213'>
       <member-function access='public'>
         <!-- void hb_auto_trace_t<0, bool>::hb_auto_trace_t(unsigned int*, const char*, void*, const char*, const char*, ...) -->
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, bool>*' -->
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'const char*' -->
@@ -4699,7 +4686,7 @@
         <!-- bool hb_auto_trace_t<0, bool>::ret(bool, unsigned int) -->
         <function-decl name='ret' mangled-name='_ZN15hb_auto_trace_tILi0EbE3retEbj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, bool>*' -->
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- parameter of type 'bool' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'unsigned int' -->
@@ -4712,7 +4699,7 @@
         <!-- void hb_auto_trace_t<0, bool>::hb_auto_trace_t(unsigned int*, const char*, void*, const char*, const char*, ...) -->
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, bool>*' -->
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'const char*' -->
@@ -4732,7 +4719,7 @@
         <!-- void hb_auto_trace_t<0, bool>::hb_auto_trace_t(unsigned int*, const char*, void*, const char*, const char*, ...) -->
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, bool>*' -->
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'const char*' -->
@@ -4752,7 +4739,7 @@
         <!-- void hb_auto_trace_t<0, bool>::hb_auto_trace_t(unsigned int*, const char*, void*, const char*, const char*, ...) -->
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, bool>*' -->
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'const char*' -->
@@ -4770,7 +4757,7 @@
       </member-function>
     </class-decl>
     <!-- struct hb_shape_plan_t -->
-    <class-decl name='hb_shape_plan_t' size-in-bits='1664' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='36' column='1' id='type-id-217'>
+    <class-decl name='hb_shape_plan_t' size-in-bits='1664' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='36' column='1' id='type-id-215'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_shape_plan_t::header -->
         <var-decl name='header' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='37' column='1'/>
@@ -4781,7 +4768,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- hb_face_t* hb_shape_plan_t::face_unsafe -->
-        <var-decl name='face_unsafe' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='41' column='1'/>
+        <var-decl name='face_unsafe' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- hb_segment_properties_t hb_shape_plan_t::props -->
@@ -4789,7 +4776,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- hb_shape_func_t* hb_shape_plan_t::shaper_func -->
-        <var-decl name='shaper_func' type-id='type-id-218' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='44' column='1'/>
+        <var-decl name='shaper_func' type-id='type-id-216' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- const char* hb_shape_plan_t::shaper_name -->
@@ -4797,7 +4784,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- hb_feature_t* hb_shape_plan_t::user_features -->
-        <var-decl name='user_features' type-id='type-id-219' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='47' column='1'/>
+        <var-decl name='user_features' type-id='type-id-217' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- unsigned int hb_shape_plan_t::num_user_features -->
@@ -4805,14 +4792,14 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- hb_shaper_data_t hb_shape_plan_t::shaper_data -->
-        <var-decl name='shaper_data' type-id='type-id-164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='50' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='50' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct hb_feature_t -->
-    <class-decl name='hb_feature_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='43' column='1' id='type-id-220'>
+    <class-decl name='hb_feature_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='43' column='1' id='type-id-218'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_tag_t hb_feature_t::tag -->
-        <var-decl name='tag' type-id='type-id-187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='44' column='1'/>
+        <var-decl name='tag' type-id='type-id-185' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- uint32_t hb_feature_t::value -->
@@ -4828,7 +4815,7 @@
       </data-member>
     </class-decl>
     <!-- struct hb_shaper_data_t -->
-    <class-decl name='hb_shaper_data_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='53' column='1' id='type-id-164'>
+    <class-decl name='hb_shaper_data_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='53' column='1' id='type-id-162'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void* hb_shaper_data_t::ot -->
         <var-decl name='ot' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='43' column='1'/>
@@ -4839,255 +4826,255 @@
       </data-member>
     </class-decl>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
     <!-- OT::BEInt<int, 4>* -->
-    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
     <!-- OT::BEInt<short int, 2>* -->
-    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-226'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
     <!-- OT::BEInt<short unsigned int, 2>* -->
-    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-226'/>
     <!-- OT::BEInt<unsigned int, 4>* -->
-    <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-230'/>
+    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-228'/>
     <!-- OT::CheckSum* -->
-    <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-232'/>
+    <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-230'/>
     <!-- OT::FixedVersion* -->
-    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-232'/>
     <!-- OT::IntType<int, 4u>* -->
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-234'/>
     <!-- OT::IntType<short int, 2u>* -->
-    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-238'/>
+    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
     <!-- OT::IntType<short unsigned int, 2u>* -->
-    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-238'/>
     <!-- OT::IntType<unsigned int, 4u>* -->
-    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-240'/>
     <!-- OT::LONGDATETIME* -->
-    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-242'/>
     <!-- OT::OffsetTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-245' size-in-bits='64' id='type-id-246'/>
+    <reference-type-def kind='lvalue' type-id='type-id-243' size-in-bits='64' id='type-id-244'/>
     <!-- OT::OffsetTable* -->
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-247'/>
+    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-245'/>
     <!-- OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-188' size-in-bits='64' id='type-id-248'/>
+    <reference-type-def kind='lvalue' type-id='type-id-186' size-in-bits='64' id='type-id-246'/>
     <!-- OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-247'/>
     <!-- OT::OpenTypeFontFile* -->
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
+    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-249'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
+    <reference-type-def kind='lvalue' type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
     <!-- OT::TTCHeader* -->
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
     <!-- OT::TTCHeaderVersion1* -->
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
     <!-- OT::TableRecord* -->
-    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-256'/>
     <!-- OT::Tag* -->
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
     <!-- OT::hb_sanitize_context_t* -->
-    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
     <!-- OT::hb_serialize_context_t* -->
-    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-262'/>
     <!-- OT::head* -->
-    <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
     <!-- OT::maxp* -->
-    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-268'/>
+    <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-221' const='yes' id='type-id-269'/>
+    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-267'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-268'/>
     <!-- const OT::BEInt<int, 4> -->
-    <qualified-type-def type-id='type-id-223' const='yes' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-221' const='yes' id='type-id-269'/>
     <!-- const OT::BEInt<int, 4>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-271' size-in-bits='64' id='type-id-272'/>
+    <reference-type-def kind='lvalue' type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
     <!-- const OT::BEInt<int, 4>* -->
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-271'/>
     <!-- const OT::BEInt<short int, 2> -->
-    <qualified-type-def type-id='type-id-225' const='yes' id='type-id-274'/>
+    <qualified-type-def type-id='type-id-223' const='yes' id='type-id-272'/>
     <!-- const OT::BEInt<short int, 2>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-274' size-in-bits='64' id='type-id-275'/>
+    <reference-type-def kind='lvalue' type-id='type-id-272' size-in-bits='64' id='type-id-273'/>
     <!-- const OT::BEInt<short int, 2>* -->
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-276'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-274'/>
     <!-- const OT::BEInt<short unsigned int, 2> -->
-    <qualified-type-def type-id='type-id-227' const='yes' id='type-id-277'/>
+    <qualified-type-def type-id='type-id-225' const='yes' id='type-id-275'/>
     <!-- const OT::BEInt<short unsigned int, 2>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
+    <reference-type-def kind='lvalue' type-id='type-id-275' size-in-bits='64' id='type-id-276'/>
     <!-- const OT::BEInt<short unsigned int, 2>* -->
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-279'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-277'/>
     <!-- const OT::BEInt<unsigned int, 4> -->
-    <qualified-type-def type-id='type-id-229' const='yes' id='type-id-280'/>
+    <qualified-type-def type-id='type-id-227' const='yes' id='type-id-278'/>
     <!-- const OT::BEInt<unsigned int, 4>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-280' size-in-bits='64' id='type-id-281'/>
+    <reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
     <!-- const OT::BEInt<unsigned int, 4>* -->
-    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-280'/>
     <!-- const OT::CheckSum -->
-    <qualified-type-def type-id='type-id-231' const='yes' id='type-id-283'/>
+    <qualified-type-def type-id='type-id-229' const='yes' id='type-id-281'/>
     <!-- const OT::CheckSum* -->
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
     <!-- const OT::FixedVersion -->
-    <qualified-type-def type-id='type-id-233' const='yes' id='type-id-285'/>
+    <qualified-type-def type-id='type-id-231' const='yes' id='type-id-283'/>
     <!-- const OT::FixedVersion* -->
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
     <!-- const OT::IntType<int, 4u> -->
-    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-287'/>
+    <qualified-type-def type-id='type-id-233' const='yes' id='type-id-285'/>
     <!-- const OT::IntType<int, 4u>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-287' size-in-bits='64' id='type-id-288'/>
+    <reference-type-def kind='lvalue' type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
     <!-- const OT::IntType<int, 4u>* -->
-    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-289'/>
+    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-287'/>
     <!-- const OT::IntType<short int, 2u> -->
-    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-290'/>
+    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-288'/>
     <!-- const OT::IntType<short int, 2u>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-290' size-in-bits='64' id='type-id-291'/>
+    <reference-type-def kind='lvalue' type-id='type-id-288' size-in-bits='64' id='type-id-289'/>
     <!-- const OT::IntType<short int, 2u>* -->
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-292'/>
+    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-290'/>
     <!-- const OT::IntType<short unsigned int, 2u> -->
-    <qualified-type-def type-id='type-id-239' const='yes' id='type-id-293'/>
+    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-291'/>
     <!-- const OT::IntType<short unsigned int, 2u>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-294'/>
+    <reference-type-def kind='lvalue' type-id='type-id-291' size-in-bits='64' id='type-id-292'/>
     <!-- const OT::IntType<short unsigned int, 2u>* -->
-    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-293'/>
     <!-- const OT::IntType<unsigned int, 4u> -->
-    <qualified-type-def type-id='type-id-241' const='yes' id='type-id-296'/>
+    <qualified-type-def type-id='type-id-239' const='yes' id='type-id-294'/>
     <!-- const OT::IntType<unsigned int, 4u>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-296' size-in-bits='64' id='type-id-297'/>
+    <reference-type-def kind='lvalue' type-id='type-id-294' size-in-bits='64' id='type-id-295'/>
     <!-- const OT::IntType<unsigned int, 4u>* -->
-    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-296'/>
     <!-- const OT::LONGDATETIME -->
-    <qualified-type-def type-id='type-id-243' const='yes' id='type-id-299'/>
+    <qualified-type-def type-id='type-id-241' const='yes' id='type-id-297'/>
     <!-- const OT::LONGDATETIME* -->
-    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
     <!-- const OT::Offset<OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-301' const='yes' id='type-id-302'/>
+    <qualified-type-def type-id='type-id-299' const='yes' id='type-id-300'/>
     <!-- const OT::Offset<OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-301'/>
     <!-- const OT::OffsetTable -->
-    <qualified-type-def type-id='type-id-245' const='yes' id='type-id-304'/>
+    <qualified-type-def type-id='type-id-243' const='yes' id='type-id-302'/>
     <!-- const OT::OffsetTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-305'/>
+    <reference-type-def kind='lvalue' type-id='type-id-302' size-in-bits='64' id='type-id-303'/>
     <!-- const OT::OffsetTable* -->
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-304'/>
     <!-- const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-307'/>
+    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-305'/>
     <!-- const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
+    <reference-type-def kind='lvalue' type-id='type-id-305' size-in-bits='64' id='type-id-306'/>
     <!-- const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-307'/>
     <!-- const OT::OpenTypeFontFace -->
-    <qualified-type-def type-id='type-id-310' const='yes' id='type-id-311'/>
+    <qualified-type-def type-id='type-id-308' const='yes' id='type-id-309'/>
     <!-- const OT::OpenTypeFontFace& -->
-    <reference-type-def kind='lvalue' type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
+    <reference-type-def kind='lvalue' type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
     <!-- const OT::OpenTypeFontFile -->
-    <qualified-type-def type-id='type-id-250' const='yes' id='type-id-313'/>
+    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-311'/>
     <!-- const OT::OpenTypeFontFile* -->
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
     <!-- const OT::TTCHeader -->
-    <qualified-type-def type-id='type-id-254' const='yes' id='type-id-315'/>
+    <qualified-type-def type-id='type-id-252' const='yes' id='type-id-313'/>
     <!-- const OT::TTCHeader* -->
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-316'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-314'/>
     <!-- const OT::TTCHeaderVersion1 -->
-    <qualified-type-def type-id='type-id-256' const='yes' id='type-id-317'/>
+    <qualified-type-def type-id='type-id-254' const='yes' id='type-id-315'/>
     <!-- const OT::TTCHeaderVersion1* -->
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-316'/>
     <!-- const OT::TableRecord -->
-    <qualified-type-def type-id='type-id-190' const='yes' id='type-id-319'/>
+    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-317'/>
     <!-- const OT::TableRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-319' size-in-bits='64' id='type-id-320'/>
+    <reference-type-def kind='lvalue' type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
     <!-- const OT::TableRecord* -->
-    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-321'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-319'/>
     <!-- const OT::Tag -->
-    <qualified-type-def type-id='type-id-259' const='yes' id='type-id-322'/>
+    <qualified-type-def type-id='type-id-257' const='yes' id='type-id-320'/>
     <!-- const OT::Tag* -->
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-321'/>
     <!-- const OT::ULONG -->
-    <qualified-type-def type-id='type-id-324' const='yes' id='type-id-325'/>
+    <qualified-type-def type-id='type-id-322' const='yes' id='type-id-323'/>
     <!-- const OT::ULONG* -->
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-324'/>
     <!-- const OT::hb_sanitize_context_t -->
-    <qualified-type-def type-id='type-id-261' const='yes' id='type-id-327'/>
+    <qualified-type-def type-id='type-id-259' const='yes' id='type-id-325'/>
     <!-- const OT::hb_sanitize_context_t* -->
-    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
     <!-- const OT::head -->
-    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-329'/>
+    <qualified-type-def type-id='type-id-263' const='yes' id='type-id-327'/>
     <!-- const OT::head* -->
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-328'/>
     <!-- const OT::maxp -->
-    <qualified-type-def type-id='type-id-267' const='yes' id='type-id-331'/>
+    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-329'/>
     <!-- const OT::maxp* -->
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-330'/>
     <!-- const hb_face_t -->
-    <qualified-type-def type-id='type-id-193' const='yes' id='type-id-333'/>
+    <qualified-type-def type-id='type-id-191' const='yes' id='type-id-331'/>
     <!-- const hb_face_t* -->
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-198'/>
+    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-196'/>
     <!-- const hb_feature_t -->
-    <qualified-type-def type-id='type-id-334' const='yes' id='type-id-335'/>
+    <qualified-type-def type-id='type-id-332' const='yes' id='type-id-333'/>
     <!-- const hb_feature_t* -->
-    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-334'/>
     <!-- const hb_font_funcs_t -->
-    <qualified-type-def type-id='type-id-199' const='yes' id='type-id-337'/>
+    <qualified-type-def type-id='type-id-197' const='yes' id='type-id-335'/>
     <!-- const hb_font_funcs_t* -->
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-336'/>
     <!-- const hb_font_t -->
-    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-339'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-337'/>
     <!-- const hb_font_t* -->
-    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
     <!-- const hb_shape_plan_t -->
-    <qualified-type-def type-id='type-id-217' const='yes' id='type-id-341'/>
+    <qualified-type-def type-id='type-id-215' const='yes' id='type-id-339'/>
     <!-- const hb_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-340'/>
     <!-- const hb_tag_t -->
-    <qualified-type-def type-id='type-id-187' const='yes' id='type-id-343'/>
+    <qualified-type-def type-id='type-id-185' const='yes' id='type-id-341'/>
     <!-- const int -->
-    <qualified-type-def type-id='type-id-9' const='yes' id='type-id-344'/>
+    <qualified-type-def type-id='type-id-9' const='yes' id='type-id-342'/>
     <!-- const int& -->
-    <reference-type-def kind='lvalue' type-id='type-id-344' size-in-bits='64' id='type-id-345'/>
+    <reference-type-def kind='lvalue' type-id='type-id-342' size-in-bits='64' id='type-id-343'/>
     <!-- hb_auto_trace_t<0, bool>* -->
-    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
     <!-- hb_blob_t* (hb_face_t*, typedef hb_tag_t, void*)* -->
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-347'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-345'/>
     <!-- hb_face_t* -->
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-160'/>
     <!-- hb_face_t::plan_node_t* -->
-    <pointer-type-def type-id='type-id-194' size-in-bits='64' id='type-id-196'/>
+    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-194'/>
     <!-- hb_feature_t* -->
-    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-219'/>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-217'/>
     <!-- hb_font_funcs_t* -->
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-161'/>
     <!-- hb_font_t* -->
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-159'/>
     <!-- hb_glyph_extents_t* -->
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-164'/>
     <!-- hb_position_t* -->
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-163'/>
     <!-- hb_shape_func_t* -->
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-218'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-216'/>
     <!-- hb_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-195'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-193'/>
     <!-- typedef hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-354'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
     <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, char*, unsigned int, void*)* -->
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-354'/>
     <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_glyph_extents_t*, void*)* -->
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
     <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_position_t*, hb_position_t*, void*)* -->
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-358'/>
     <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
+    <!-- typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, void*)* -->
     <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
     <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*)* -->
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
-    <!-- typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-366'/>
     <!-- typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-368'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-366'/>
     <!-- variadic parameter type -->
-    <type-decl name='variadic parameter type' id='type-id-369'/>
+    <type-decl name='variadic parameter type' id='type-id-367'/>
     <!-- hb_face_t* hb_face_create_for_tables(hb_reference_table_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_face_create_for_tables' mangled-name='hb_face_create_for_tables' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create_for_tables'>
       <!-- parameter of type 'typedef hb_reference_table_func_t' -->
-      <parameter type-id='type-id-197' name='reference_table_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1'/>
+      <parameter type-id='type-id-195' name='reference_table_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='84' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='85' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- hb_face_t* hb_face_create(hb_blob_t*, unsigned int) -->
     <function-decl name='hb_face_create' mangled-name='hb_face_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create'>
@@ -5096,31 +5083,31 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='164' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- hb_face_t* hb_face_get_empty() -->
     <function-decl name='hb_face_get_empty' mangled-name='hb_face_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_empty'>
       <!-- hb_face_t* -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- hb_face_t* hb_face_reference(hb_face_t*) -->
     <function-decl name='hb_face_reference' mangled-name='hb_face_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- void hb_face_destroy(hb_face_t*) -->
     <function-decl name='hb_face_destroy' mangled-name='hb_face_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_destroy'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='226' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='226' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_face_set_user_data(hb_face_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_face_set_user_data' mangled-name='hb_face_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_user_data'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='264' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -5135,7 +5122,7 @@
     <!-- void* hb_face_get_user_data(hb_face_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_face_get_user_data' mangled-name='hb_face_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_user_data'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='285' column='1'/>
       <!-- void* -->
@@ -5144,37 +5131,37 @@
     <!-- void hb_face_make_immutable(hb_face_t*) -->
     <function-decl name='hb_face_make_immutable' mangled-name='hb_face_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_make_immutable'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_face_is_immutable(hb_face_t*) -->
     <function-decl name='hb_face_is_immutable' mangled-name='hb_face_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_is_immutable'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- hb_blob_t* hb_face_reference_table(hb_face_t*, hb_tag_t) -->
     <function-decl name='hb_face_reference_table' mangled-name='hb_face_reference_table' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference_table'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='337' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='337' column='1'/>
       <!-- hb_blob_t* -->
       <return type-id='type-id-57'/>
     </function-decl>
     <!-- hb_blob_t* hb_face_reference_blob(hb_face_t*) -->
     <function-decl name='hb_face_reference_blob' mangled-name='hb_face_reference_blob' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference_blob'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1'/>
       <!-- hb_blob_t* -->
       <return type-id='type-id-57'/>
     </function-decl>
     <!-- void hb_face_set_index(hb_face_t*, unsigned int) -->
     <function-decl name='hb_face_set_index' mangled-name='hb_face_set_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_index'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='369' column='1'/>
       <!-- void -->
@@ -5183,14 +5170,14 @@
     <!-- unsigned int hb_face_get_index(hb_face_t*) -->
     <function-decl name='hb_face_get_index' mangled-name='hb_face_get_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_index'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- void hb_face_set_upem(hb_face_t*, unsigned int) -->
     <function-decl name='hb_face_set_upem' mangled-name='hb_face_set_upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_upem'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='403' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='403' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='404' column='1'/>
       <!-- void -->
@@ -5199,14 +5186,14 @@
     <!-- unsigned int hb_face_get_upem(hb_face_t*) -->
     <function-decl name='hb_face_get_upem' mangled-name='hb_face_get_upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_upem'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='423' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='423' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- void hb_face_set_glyph_count(hb_face_t*, unsigned int) -->
     <function-decl name='hb_face_set_glyph_count' mangled-name='hb_face_set_glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_glyph_count'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='447' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='447' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='448' column='1'/>
       <!-- void -->
@@ -5215,65 +5202,65 @@
     <!-- unsigned int hb_face_get_glyph_count(hb_face_t*) -->
     <function-decl name='hb_face_get_glyph_count' mangled-name='hb_face_get_glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_glyph_count'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='467' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='467' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- typedef hb_face_t hb_face_t -->
-    <typedef-decl name='hb_face_t' type-id='type-id-193' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-348'/>
+    <typedef-decl name='hb_face_t' type-id='type-id-191' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-346'/>
     <!-- typedef hb_blob_t* (hb_face_t*, typedef hb_tag_t, void*)* hb_reference_table_func_t -->
-    <typedef-decl name='hb_reference_table_func_t' type-id='type-id-347' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-197'/>
+    <typedef-decl name='hb_reference_table_func_t' type-id='type-id-345' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-195'/>
     <!-- typedef hb_font_funcs_t hb_font_funcs_t -->
-    <typedef-decl name='hb_font_funcs_t' type-id='type-id-199' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-349'/>
+    <typedef-decl name='hb_font_funcs_t' type-id='type-id-197' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-347'/>
     <!-- typedef hb_glyph_extents_t hb_glyph_extents_t -->
-    <typedef-decl name='hb_glyph_extents_t' type-id='type-id-214' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-350'/>
+    <typedef-decl name='hb_glyph_extents_t' type-id='type-id-212' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-348'/>
     <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_font_get_glyph_func_t -->
-    <typedef-decl name='hb_font_get_glyph_func_t' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='97' column='1' id='type-id-201'/>
+    <typedef-decl name='hb_font_get_glyph_func_t' type-id='type-id-360' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='97' column='1' id='type-id-199'/>
     <!-- typedef typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, void*)* hb_font_get_glyph_advance_func_t -->
-    <typedef-decl name='hb_font_get_glyph_advance_func_t' type-id='type-id-368' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='102' column='1' id='type-id-370'/>
+    <typedef-decl name='hb_font_get_glyph_advance_func_t' type-id='type-id-366' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='102' column='1' id='type-id-368'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t -->
-    <typedef-decl name='hb_font_get_glyph_h_advance_func_t' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='103' column='1' id='type-id-202'/>
+    <typedef-decl name='hb_font_get_glyph_h_advance_func_t' type-id='type-id-368' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='103' column='1' id='type-id-200'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t -->
-    <typedef-decl name='hb_font_get_glyph_v_advance_func_t' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='104' column='1' id='type-id-203'/>
+    <typedef-decl name='hb_font_get_glyph_v_advance_func_t' type-id='type-id-368' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='104' column='1' id='type-id-201'/>
     <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_position_t*, hb_position_t*, void*)* hb_font_get_glyph_origin_func_t -->
-    <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-360' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-371'/>
+    <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-358' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-369'/>
     <!-- typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t -->
-    <typedef-decl name='hb_font_get_glyph_h_origin_func_t' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='110' column='1' id='type-id-204'/>
+    <typedef-decl name='hb_font_get_glyph_h_origin_func_t' type-id='type-id-369' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='110' column='1' id='type-id-202'/>
     <!-- typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_v_origin_func_t -->
-    <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-205'/>
+    <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-369' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-203'/>
     <!-- typedef typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, void*)* hb_font_get_glyph_kerning_func_t -->
-    <typedef-decl name='hb_font_get_glyph_kerning_func_t' type-id='type-id-366' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='115' column='1' id='type-id-372'/>
+    <typedef-decl name='hb_font_get_glyph_kerning_func_t' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='115' column='1' id='type-id-370'/>
     <!-- typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_h_kerning_func_t -->
-    <typedef-decl name='hb_font_get_glyph_h_kerning_func_t' type-id='type-id-372' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='116' column='1' id='type-id-206'/>
+    <typedef-decl name='hb_font_get_glyph_h_kerning_func_t' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='116' column='1' id='type-id-204'/>
     <!-- typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_v_kerning_func_t -->
-    <typedef-decl name='hb_font_get_glyph_v_kerning_func_t' type-id='type-id-372' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='117' column='1' id='type-id-207'/>
+    <typedef-decl name='hb_font_get_glyph_v_kerning_func_t' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='117' column='1' id='type-id-205'/>
     <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_glyph_extents_t*, void*)* hb_font_get_glyph_extents_func_t -->
-    <typedef-decl name='hb_font_get_glyph_extents_func_t' type-id='type-id-358' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='123' column='1' id='type-id-208'/>
+    <typedef-decl name='hb_font_get_glyph_extents_func_t' type-id='type-id-356' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='123' column='1' id='type-id-206'/>
     <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*)* hb_font_get_glyph_contour_point_func_t -->
-    <typedef-decl name='hb_font_get_glyph_contour_point_func_t' type-id='type-id-364' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='127' column='1' id='type-id-209'/>
+    <typedef-decl name='hb_font_get_glyph_contour_point_func_t' type-id='type-id-364' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='127' column='1' id='type-id-207'/>
     <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, char*, unsigned int, void*)* hb_font_get_glyph_name_func_t -->
-    <typedef-decl name='hb_font_get_glyph_name_func_t' type-id='type-id-356' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='133' column='1' id='type-id-210'/>
+    <typedef-decl name='hb_font_get_glyph_name_func_t' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='133' column='1' id='type-id-208'/>
     <!-- typedef typedef hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*)* hb_font_get_glyph_from_name_func_t -->
-    <typedef-decl name='hb_font_get_glyph_from_name_func_t' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='137' column='1' id='type-id-211'/>
+    <typedef-decl name='hb_font_get_glyph_from_name_func_t' type-id='type-id-352' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='137' column='1' id='type-id-209'/>
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::TableRecord -->
-      <class-decl name='TableRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='55' column='1' id='type-id-190'>
+      <class-decl name='TableRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='55' column='1' id='type-id-188'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::TableRecord::tag -->
-          <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='61' column='1'/>
+          <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::CheckSum OT::TableRecord::checkSum -->
-          <var-decl name='checkSum' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='62' column='1'/>
+          <var-decl name='checkSum' type-id='type-id-229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::ULONG OT::TableRecord::offset -->
-          <var-decl name='offset' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='63' column='1'/>
+          <var-decl name='offset' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='63' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
           <!-- OT::ULONG OT::TableRecord::length -->
-          <var-decl name='length' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='65' column='1'/>
+          <var-decl name='length' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='65' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::TableRecord::static_size -->
@@ -5285,30 +5272,30 @@
         </data-member>
       </class-decl>
       <!-- struct OT::OffsetTable -->
-      <class-decl name='OffsetTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='71' column='1' id='type-id-245'>
+      <class-decl name='OffsetTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='71' column='1' id='type-id-243'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::OffsetTable::sfnt_version -->
-          <var-decl name='sfnt_version' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='111' column='1'/>
+          <var-decl name='sfnt_version' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='111' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::OffsetTable::numTables -->
-          <var-decl name='numTables' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='112' column='1'/>
+          <var-decl name='numTables' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='112' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::OffsetTable::searchRangeZ -->
-          <var-decl name='searchRangeZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='113' column='1'/>
+          <var-decl name='searchRangeZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='113' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::USHORT OT::OffsetTable::entrySelectorZ -->
-          <var-decl name='entrySelectorZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='114' column='1'/>
+          <var-decl name='entrySelectorZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='114' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::USHORT OT::OffsetTable::rangeShiftZ -->
-          <var-decl name='rangeShiftZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='115' column='1'/>
+          <var-decl name='rangeShiftZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='115' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::TableRecord OT::OffsetTable::tables[1] -->
-          <var-decl name='tables' type-id='type-id-191' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='116' column='1'/>
+          <var-decl name='tables' type-id='type-id-189' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='116' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTable::min_size -->
@@ -5318,9 +5305,9 @@
           <!-- bool OT::OffsetTable::find_table_index(hb_tag_t, unsigned int*) -->
           <function-decl name='find_table_index' mangled-name='_ZNK2OT11OffsetTable16find_table_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTable*' -->
-            <parameter type-id='type-id-306' is-artificial='yes'/>
+            <parameter type-id='type-id-304' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- bool -->
@@ -5331,49 +5318,49 @@
           <!-- const OT::TableRecord& OT::OffsetTable::get_table(unsigned int) -->
           <function-decl name='get_table' mangled-name='_ZNK2OT11OffsetTable9get_tableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTable*' -->
-            <parameter type-id='type-id-306' is-artificial='yes'/>
+            <parameter type-id='type-id-304' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::TableRecord& -->
-            <return type-id='type-id-320'/>
+            <return type-id='type-id-318'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- const OT::TableRecord& OT::OffsetTable::get_table_by_tag(hb_tag_t) -->
           <function-decl name='get_table_by_tag' mangled-name='_ZNK2OT11OffsetTable16get_table_by_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTable*' -->
-            <parameter type-id='type-id-306' is-artificial='yes'/>
+            <parameter type-id='type-id-304' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <!-- const OT::TableRecord& -->
-            <return type-id='type-id-320'/>
+            <return type-id='type-id-318'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::OffsetTable::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT11OffsetTable8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTable*' -->
-            <parameter type-id='type-id-247' is-artificial='yes'/>
+            <parameter type-id='type-id-245' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::TTCHeaderVersion1 -->
-      <class-decl name='TTCHeaderVersion1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='127' column='1' id='type-id-256'>
+      <class-decl name='TTCHeaderVersion1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='127' column='1' id='type-id-254'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::TTCHeaderVersion1::ttcTag -->
-          <var-decl name='ttcTag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='139' column='1'/>
+          <var-decl name='ttcTag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='139' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::FixedVersion OT::TTCHeaderVersion1::version -->
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='140' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='140' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > OT::TTCHeaderVersion1::table -->
-          <var-decl name='table' type-id='type-id-221' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='143' column='1'/>
+          <var-decl name='table' type-id='type-id-219' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='143' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::TTCHeaderVersion1::min_size -->
@@ -5383,9 +5370,9 @@
           <!-- bool OT::TTCHeaderVersion1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT17TTCHeaderVersion18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::TTCHeaderVersion1*' -->
-            <parameter type-id='type-id-257' is-artificial='yes'/>
+            <parameter type-id='type-id-255' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5394,53 +5381,53 @@
           <!-- const OT::OpenTypeFontFace& OT::TTCHeaderVersion1::get_face(unsigned int) -->
           <function-decl name='get_face' mangled-name='_ZNK2OT17TTCHeaderVersion18get_faceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::TTCHeaderVersion1*' -->
-            <parameter type-id='type-id-318' is-artificial='yes'/>
+            <parameter type-id='type-id-316' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OpenTypeFontFace& -->
-            <return type-id='type-id-312'/>
+            <return type-id='type-id-310'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::TTCHeader -->
-      <class-decl name='TTCHeader' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='150' column='1' id='type-id-254'>
+      <class-decl name='TTCHeader' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='150' column='1' id='type-id-252'>
         <member-type access='protected'>
           <!-- union {struct {OT::Tag ttcTag; OT::FixedVersion version;} header; OT::TTCHeaderVersion1 version1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='183' column='1' id='type-id-374'>
+          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='183' column='1' id='type-id-372'>
             <member-type access='public'>
               <!-- struct {OT::Tag ttcTag; OT::FixedVersion version;} -->
-              <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='184' column='1' id='type-id-375'>
+              <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='184' column='1' id='type-id-373'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <!-- OT::Tag ttcTag -->
-                  <var-decl name='ttcTag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='185' column='1'/>
+                  <var-decl name='ttcTag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='185' column='1'/>
                 </data-member>
                 <data-member access='public' layout-offset-in-bits='32'>
                   <!-- OT::FixedVersion version -->
-                  <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='186' column='1'/>
+                  <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='186' column='1'/>
                 </data-member>
               </class-decl>
             </member-type>
             <data-member access='public'>
               <!-- struct {OT::Tag ttcTag; OT::FixedVersion version;} header -->
-              <var-decl name='header' type-id='type-id-375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='188' column='1'/>
+              <var-decl name='header' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='188' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::TTCHeaderVersion1 version1 -->
-              <var-decl name='version1' type-id='type-id-256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='189' column='1'/>
+              <var-decl name='version1' type-id='type-id-254' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='189' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {struct {OT::Tag ttcTag; OT::FixedVersion version;} header; OT::TTCHeaderVersion1 version1;} OT::TTCHeader::u -->
-          <var-decl name='u' type-id='type-id-374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='190' column='1'/>
+          <var-decl name='u' type-id='type-id-372' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='190' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- bool OT::TTCHeader::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9TTCHeader8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::TTCHeader*' -->
-            <parameter type-id='type-id-255' is-artificial='yes'/>
+            <parameter type-id='type-id-253' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5449,60 +5436,60 @@
           <!-- const OT::OpenTypeFontFace& OT::TTCHeader::get_face(unsigned int) -->
           <function-decl name='get_face' mangled-name='_ZNK2OT9TTCHeader8get_faceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::TTCHeader*' -->
-            <parameter type-id='type-id-316' is-artificial='yes'/>
+            <parameter type-id='type-id-314' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OpenTypeFontFace& -->
-            <return type-id='type-id-312'/>
+            <return type-id='type-id-310'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OpenTypeFontFile -->
-      <class-decl name='OpenTypeFontFile' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='199' column='1' id='type-id-250'>
+      <class-decl name='OpenTypeFontFile' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='199' column='1' id='type-id-248'>
         <member-type access='protected'>
           <!-- union {OT::Tag tag; OT::OpenTypeFontFace fontFace; OT::TTCHeader ttcHeader;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='224' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='250' column='1' id='type-id-376'>
+          <union-decl name='__anonymous_union__' size-in-bits='224' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='250' column='1' id='type-id-374'>
             <data-member access='public'>
               <!-- OT::Tag tag -->
-              <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='251' column='1'/>
+              <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='251' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::OpenTypeFontFace fontFace -->
-              <var-decl name='fontFace' type-id='type-id-310' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='252' column='1'/>
+              <var-decl name='fontFace' type-id='type-id-308' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='252' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::TTCHeader ttcHeader -->
-              <var-decl name='ttcHeader' type-id='type-id-254' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='253' column='1'/>
+              <var-decl name='ttcHeader' type-id='type-id-252' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='253' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::OpenTypeFontFile::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='200' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='200' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::OpenTypeFontFile::CFFTag -->
-          <var-decl name='CFFTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='202' column='1'/>
+          <var-decl name='CFFTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='202' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::OpenTypeFontFile::TrueTypeTag -->
-          <var-decl name='TrueTypeTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='203' column='1'/>
+          <var-decl name='TrueTypeTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='203' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::OpenTypeFontFile::TTCTag -->
-          <var-decl name='TTCTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='204' column='1'/>
+          <var-decl name='TTCTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='204' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::OpenTypeFontFile::TrueTag -->
-          <var-decl name='TrueTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='205' column='1'/>
+          <var-decl name='TrueTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='205' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::OpenTypeFontFile::Typ1Tag -->
-          <var-decl name='Typ1Tag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='206' column='1'/>
+          <var-decl name='Typ1Tag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='206' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::Tag tag; OT::OpenTypeFontFace fontFace; OT::TTCHeader ttcHeader;} OT::OpenTypeFontFile::u -->
-          <var-decl name='u' type-id='type-id-376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='254' column='1'/>
+          <var-decl name='u' type-id='type-id-374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='254' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OpenTypeFontFile::min_size -->
@@ -5512,30 +5499,30 @@
           <!-- const OT::OpenTypeFontFace& OT::OpenTypeFontFile::get_face(unsigned int) -->
           <function-decl name='get_face' mangled-name='_ZNK2OT16OpenTypeFontFile8get_faceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OpenTypeFontFile*' -->
-            <parameter type-id='type-id-314' is-artificial='yes'/>
+            <parameter type-id='type-id-312' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OpenTypeFontFace& -->
-            <return type-id='type-id-312'/>
+            <return type-id='type-id-310'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::OpenTypeFontFile::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT16OpenTypeFontFile8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OpenTypeFontFile*' -->
-            <parameter type-id='type-id-251' is-artificial='yes'/>
+            <parameter type-id='type-id-249' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::hb_sanitize_context_t -->
-      <class-decl name='hb_sanitize_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='178' column='1' id='type-id-261'>
+      <class-decl name='hb_sanitize_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='178' column='1' id='type-id-259'>
         <member-type access='public'>
           <!-- typedef bool OT::hb_sanitize_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='181' column='1' id='type-id-377'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='181' column='1' id='type-id-375'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_sanitize_context_t::max_debug_depth -->
@@ -5569,11 +5556,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, int>(OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-249'/>
+            <parameter type-id='type-id-247'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5582,9 +5569,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::maxp>(const OT::maxp*) -->
           <function-decl name='check_struct&lt;OT::maxp&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::maxp*' -->
-            <parameter type-id='type-id-332'/>
+            <parameter type-id='type-id-330'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5593,9 +5580,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::head>(const OT::head*) -->
           <function-decl name='check_struct&lt;OT::head&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::head*' -->
-            <parameter type-id='type-id-330'/>
+            <parameter type-id='type-id-328'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5604,9 +5591,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::IntType<unsigned int, 4u> >(const OT::IntType<unsigned int, 4u>*) -->
           <function-decl name='check_struct&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::IntType<unsigned int, 4u>*' -->
-            <parameter type-id='type-id-298'/>
+            <parameter type-id='type-id-296'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5615,9 +5602,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTable>(const OT::OffsetTable*) -->
           <function-decl name='check_struct&lt;OT::OffsetTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTable*' -->
-            <parameter type-id='type-id-306'/>
+            <parameter type-id='type-id-304'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5626,9 +5613,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::FixedVersion>(const OT::FixedVersion*) -->
           <function-decl name='check_struct&lt;OT::FixedVersion&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::FixedVersion*' -->
-            <parameter type-id='type-id-286'/>
+            <parameter type-id='type-id-284'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5637,9 +5624,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > >(const OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-270'/>
+            <parameter type-id='type-id-268'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5648,9 +5635,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> > >(const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-309'/>
+            <parameter type-id='type-id-307'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5659,7 +5646,7 @@
           <!-- bool OT::hb_sanitize_context_t::may_edit(void*, unsigned int) -->
           <function-decl name='may_edit' mangled-name='_ZN2OT21hb_sanitize_context_t8may_editEPKvj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -5672,7 +5659,7 @@
           <!-- bool OT::hb_sanitize_context_t::check_range(void*, unsigned int) -->
           <function-decl name='check_range' mangled-name='_ZNK2OT21hb_sanitize_context_t11check_rangeEPKvj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -5685,7 +5672,7 @@
           <!-- const char* OT::hb_sanitize_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT21hb_sanitize_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-15'/>
           </function-decl>
@@ -5694,7 +5681,7 @@
           <!-- void OT::hb_sanitize_context_t::init(hb_blob_t*) -->
           <function-decl name='init' mangled-name='_ZN2OT21hb_sanitize_context_t4initEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-57'/>
             <!-- void -->
@@ -5705,7 +5692,7 @@
           <!-- void OT::hb_sanitize_context_t::start_processing() -->
           <function-decl name='start_processing' mangled-name='_ZN2OT21hb_sanitize_context_t16start_processingEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -5714,7 +5701,7 @@
           <!-- void OT::hb_sanitize_context_t::end_processing() -->
           <function-decl name='end_processing' mangled-name='_ZN2OT21hb_sanitize_context_t14end_processingEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -5723,7 +5710,7 @@
           <!-- bool OT::hb_sanitize_context_t::check_array(void*, unsigned int, unsigned int) -->
           <function-decl name='check_array' mangled-name='_ZNK2OT21hb_sanitize_context_t11check_arrayEPKvjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -5738,11 +5725,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >, int>(OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-378'/>
+            <parameter type-id='type-id-376'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5751,11 +5738,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >, int>(OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-379'/>
+            <parameter type-id='type-id-377'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5764,11 +5751,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >, int>(OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-380'/>
+            <parameter type-id='type-id-378'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5777,9 +5764,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-381'/>
+            <parameter type-id='type-id-379'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5788,9 +5775,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::IntType<short unsigned int, 2u> >(const OT::IntType<short unsigned int, 2u>*) -->
           <function-decl name='check_struct&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-293'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5799,9 +5786,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CmapSubtableFormat0>(const OT::CmapSubtableFormat0*) -->
           <function-decl name='check_struct&lt;OT::CmapSubtableFormat0&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CmapSubtableFormat0*' -->
-            <parameter type-id='type-id-382'/>
+            <parameter type-id='type-id-380'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5810,9 +5797,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CmapSubtableFormat4>(const OT::CmapSubtableFormat4*) -->
           <function-decl name='check_struct&lt;OT::CmapSubtableFormat4&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CmapSubtableFormat4*' -->
-            <parameter type-id='type-id-383'/>
+            <parameter type-id='type-id-381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5821,11 +5808,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::USHORT, uint16_t>(OT::USHORT*, const uint16_t&) -->
           <function-decl name='try_set&lt;OT::USHORT, uint16_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::USHORT*' -->
-            <parameter type-id='type-id-384'/>
+            <parameter type-id='type-id-382'/>
             <!-- parameter of type 'const uint16_t&' -->
-            <parameter type-id='type-id-385'/>
+            <parameter type-id='type-id-383'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5834,9 +5821,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-386'/>
+            <parameter type-id='type-id-384'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5845,9 +5832,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > >(const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-387'/>
+            <parameter type-id='type-id-385'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5856,9 +5843,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > >(const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-388'/>
+            <parameter type-id='type-id-386'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5867,9 +5854,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > >(const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-389'/>
+            <parameter type-id='type-id-387'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5878,9 +5865,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > >(const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-390'/>
+            <parameter type-id='type-id-388'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5889,9 +5876,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> >(const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>*) -->
           <function-decl name='check_struct&lt;OT::CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>*' -->
-            <parameter type-id='type-id-391'/>
+            <parameter type-id='type-id-389'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5900,9 +5887,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> >(const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>*) -->
           <function-decl name='check_struct&lt;OT::CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>*' -->
-            <parameter type-id='type-id-392'/>
+            <parameter type-id='type-id-390'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5911,9 +5898,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > >(const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-393'/>
+            <parameter type-id='type-id-391'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5922,9 +5909,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > >(const OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-394'/>
+            <parameter type-id='type-id-392'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5933,9 +5920,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > >(const OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-395'/>
+            <parameter type-id='type-id-393'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5944,9 +5931,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > >(const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-396'/>
+            <parameter type-id='type-id-394'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5955,9 +5942,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > >(const OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-397'/>
+            <parameter type-id='type-id-395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5966,9 +5953,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::VariationSelectorRecord>(const OT::VariationSelectorRecord*) -->
           <function-decl name='check_struct&lt;OT::VariationSelectorRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::VariationSelectorRecord*' -->
-            <parameter type-id='type-id-398'/>
+            <parameter type-id='type-id-396'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5977,9 +5964,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CmapSubtableFormat14>(const OT::CmapSubtableFormat14*) -->
           <function-decl name='check_struct&lt;OT::CmapSubtableFormat14&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CmapSubtableFormat14*' -->
-            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-397'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5988,9 +5975,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> > >(const OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-400'/>
+            <parameter type-id='type-id-398'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -5999,9 +5986,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::EncodingRecord>(const OT::EncodingRecord*) -->
           <function-decl name='check_struct&lt;OT::EncodingRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::EncodingRecord*' -->
-            <parameter type-id='type-id-401'/>
+            <parameter type-id='type-id-399'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6010,9 +5997,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::cmap>(const OT::cmap*) -->
           <function-decl name='check_struct&lt;OT::cmap&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::cmap*' -->
-            <parameter type-id='type-id-402'/>
+            <parameter type-id='type-id-400'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6021,9 +6008,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::_hea>(const OT::_hea*) -->
           <function-decl name='check_struct&lt;OT::_hea&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::_hea*' -->
-            <parameter type-id='type-id-403'/>
+            <parameter type-id='type-id-401'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6032,11 +6019,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-404'/>
+            <parameter type-id='type-id-402'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6045,11 +6032,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-405'/>
+            <parameter type-id='type-id-403'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6058,11 +6045,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-406'/>
+            <parameter type-id='type-id-404'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6071,11 +6058,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-407'/>
+            <parameter type-id='type-id-405'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6084,11 +6071,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-408'/>
+            <parameter type-id='type-id-406'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6097,11 +6084,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-409'/>
+            <parameter type-id='type-id-407'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6110,11 +6097,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-410'/>
+            <parameter type-id='type-id-408'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6123,11 +6110,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-411'/>
+            <parameter type-id='type-id-409'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6136,11 +6123,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-412'/>
+            <parameter type-id='type-id-410'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6149,11 +6136,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-411'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6162,11 +6149,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-414'/>
+            <parameter type-id='type-id-412'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6175,11 +6162,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-415'/>
+            <parameter type-id='type-id-413'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6188,11 +6175,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-416'/>
+            <parameter type-id='type-id-414'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6201,11 +6188,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-417'/>
+            <parameter type-id='type-id-415'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6214,11 +6201,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-418'/>
+            <parameter type-id='type-id-416'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6227,11 +6214,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-419'/>
+            <parameter type-id='type-id-417'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6240,11 +6227,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-420'/>
+            <parameter type-id='type-id-418'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6253,11 +6240,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-421'/>
+            <parameter type-id='type-id-419'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6266,11 +6253,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-422'/>
+            <parameter type-id='type-id-420'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6279,11 +6266,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-423'/>
+            <parameter type-id='type-id-421'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6292,11 +6279,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, int>(OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-424'/>
+            <parameter type-id='type-id-422'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6305,11 +6292,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-425'/>
+            <parameter type-id='type-id-423'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6318,11 +6305,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-426'/>
+            <parameter type-id='type-id-424'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6331,11 +6318,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-427'/>
+            <parameter type-id='type-id-425'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6344,11 +6331,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-428'/>
+            <parameter type-id='type-id-426'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6357,11 +6344,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-429'/>
+            <parameter type-id='type-id-427'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6370,11 +6357,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-430'/>
+            <parameter type-id='type-id-428'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6383,11 +6370,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-431'/>
+            <parameter type-id='type-id-429'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6396,11 +6383,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-432'/>
+            <parameter type-id='type-id-430'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6409,11 +6396,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-433'/>
+            <parameter type-id='type-id-431'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6422,11 +6409,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-434'/>
+            <parameter type-id='type-id-432'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6435,11 +6422,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-435'/>
+            <parameter type-id='type-id-433'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6448,11 +6435,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-436'/>
+            <parameter type-id='type-id-434'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6461,11 +6448,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-437'/>
+            <parameter type-id='type-id-435'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6474,11 +6461,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-438'/>
+            <parameter type-id='type-id-436'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6487,11 +6474,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >, int>(OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >*, const int&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-439'/>
+            <parameter type-id='type-id-437'/>
             <!-- parameter of type 'const int&' -->
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-343'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6500,9 +6487,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::FixedVersion>(const OT::FixedVersion*) -->
           <function-decl name='check_struct&lt;OT::FixedVersion&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::FixedVersion*' -->
-            <parameter type-id='type-id-286'/>
+            <parameter type-id='type-id-284'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6511,9 +6498,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::IntType<short unsigned int, 2u> >(const OT::IntType<short unsigned int, 2u>*) -->
           <function-decl name='check_struct&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-293'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6522,9 +6509,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-386'/>
+            <parameter type-id='type-id-384'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6533,9 +6520,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-440'/>
+            <parameter type-id='type-id-438'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6544,9 +6531,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-441'/>
+            <parameter type-id='type-id-439'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6555,9 +6542,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-442'/>
+            <parameter type-id='type-id-440'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6566,9 +6553,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-443'/>
+            <parameter type-id='type-id-441'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6577,9 +6564,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-444'/>
+            <parameter type-id='type-id-442'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6588,9 +6575,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-445'/>
+            <parameter type-id='type-id-443'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6599,9 +6586,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-446'/>
+            <parameter type-id='type-id-444'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6610,9 +6597,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CaretValueFormat1>(const OT::CaretValueFormat1*) -->
           <function-decl name='check_struct&lt;OT::CaretValueFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CaretValueFormat1*' -->
-            <parameter type-id='type-id-447'/>
+            <parameter type-id='type-id-445'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6621,9 +6608,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CaretValueFormat2>(const OT::CaretValueFormat2*) -->
           <function-decl name='check_struct&lt;OT::CaretValueFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CaretValueFormat2*' -->
-            <parameter type-id='type-id-448'/>
+            <parameter type-id='type-id-446'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6632,9 +6619,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::Device>(const OT::Device*) -->
           <function-decl name='check_struct&lt;OT::Device&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Device*' -->
-            <parameter type-id='type-id-449'/>
+            <parameter type-id='type-id-447'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6643,9 +6630,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-450'/>
+            <parameter type-id='type-id-448'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6654,9 +6641,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::CaretValueFormat3>(const OT::CaretValueFormat3*) -->
           <function-decl name='check_struct&lt;OT::CaretValueFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CaretValueFormat3*' -->
-            <parameter type-id='type-id-451'/>
+            <parameter type-id='type-id-449'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6665,9 +6652,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-452'/>
+            <parameter type-id='type-id-450'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6676,9 +6663,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-453'/>
+            <parameter type-id='type-id-451'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6687,9 +6674,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-454'/>
+            <parameter type-id='type-id-452'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6698,9 +6685,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ClassDefFormat1>(const OT::ClassDefFormat1*) -->
           <function-decl name='check_struct&lt;OT::ClassDefFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ClassDefFormat1*' -->
-            <parameter type-id='type-id-455'/>
+            <parameter type-id='type-id-453'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6709,9 +6696,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-456'/>
+            <parameter type-id='type-id-454'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6720,9 +6707,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-457'/>
+            <parameter type-id='type-id-455'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6731,9 +6718,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > >(const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-458'/>
+            <parameter type-id='type-id-456'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6742,9 +6729,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-459'/>
+            <parameter type-id='type-id-457'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6753,9 +6740,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-460'/>
+            <parameter type-id='type-id-458'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6764,9 +6751,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-461'/>
+            <parameter type-id='type-id-459'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6775,9 +6762,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::LangSys>(const OT::LangSys*) -->
           <function-decl name='check_struct&lt;OT::LangSys&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LangSys*' -->
-            <parameter type-id='type-id-462'/>
+            <parameter type-id='type-id-460'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6786,9 +6773,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-463'/>
+            <parameter type-id='type-id-461'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6797,9 +6784,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-464'/>
+            <parameter type-id='type-id-462'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6808,9 +6795,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::Record<OT::LangSys> >(const OT::Record<OT::LangSys>*) -->
           <function-decl name='check_struct&lt;OT::Record&lt;OT::LangSys&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Record<OT::LangSys>*' -->
-            <parameter type-id='type-id-465'/>
+            <parameter type-id='type-id-463'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6819,9 +6806,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-466'/>
+            <parameter type-id='type-id-464'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6830,9 +6817,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::Record<OT::Script> >(const OT::Record<OT::Script>*) -->
           <function-decl name='check_struct&lt;OT::Record&lt;OT::Script&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Record<OT::Script>*' -->
-            <parameter type-id='type-id-467'/>
+            <parameter type-id='type-id-465'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6841,9 +6828,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-468'/>
+            <parameter type-id='type-id-466'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6852,9 +6839,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-469'/>
+            <parameter type-id='type-id-467'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6863,9 +6850,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::FeatureParamsSize>(const OT::FeatureParamsSize*) -->
           <function-decl name='check_struct&lt;OT::FeatureParamsSize&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::FeatureParamsSize*' -->
-            <parameter type-id='type-id-470'/>
+            <parameter type-id='type-id-468'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6874,9 +6861,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::FeatureParamsStylisticSet>(const OT::FeatureParamsStylisticSet*) -->
           <function-decl name='check_struct&lt;OT::FeatureParamsStylisticSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::FeatureParamsStylisticSet*' -->
-            <parameter type-id='type-id-471'/>
+            <parameter type-id='type-id-469'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6885,9 +6872,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-470'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6896,9 +6883,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::FeatureParamsCharacterVariants>(const OT::FeatureParamsCharacterVariants*) -->
           <function-decl name='check_struct&lt;OT::FeatureParamsCharacterVariants&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::FeatureParamsCharacterVariants*' -->
-            <parameter type-id='type-id-473'/>
+            <parameter type-id='type-id-471'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6907,9 +6894,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-474'/>
+            <parameter type-id='type-id-472'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6918,9 +6905,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::Feature>(const OT::Feature*) -->
           <function-decl name='check_struct&lt;OT::Feature&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Feature*' -->
-            <parameter type-id='type-id-475'/>
+            <parameter type-id='type-id-473'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6929,11 +6916,11 @@
           <!-- bool OT::hb_sanitize_context_t::try_set<OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >, OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > >(OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*, const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <!-- parameter of type 'OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-405'/>
+            <parameter type-id='type-id-403'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-476'/>
+            <parameter type-id='type-id-474'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6942,9 +6929,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-477'/>
+            <parameter type-id='type-id-475'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6953,9 +6940,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::Record<OT::Feature> >(const OT::Record<OT::Feature>*) -->
           <function-decl name='check_struct&lt;OT::Record&lt;OT::Feature&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Record<OT::Feature>*' -->
-            <parameter type-id='type-id-478'/>
+            <parameter type-id='type-id-476'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6964,9 +6951,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-479'/>
+            <parameter type-id='type-id-477'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6975,9 +6962,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-480'/>
+            <parameter type-id='type-id-478'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6986,9 +6973,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-479'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -6997,9 +6984,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::Lookup>(const OT::Lookup*) -->
           <function-decl name='check_struct&lt;OT::Lookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Lookup*' -->
-            <parameter type-id='type-id-482'/>
+            <parameter type-id='type-id-480'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7008,9 +6995,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-483'/>
+            <parameter type-id='type-id-481'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7019,9 +7006,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-484'/>
+            <parameter type-id='type-id-482'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7030,9 +7017,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-485'/>
+            <parameter type-id='type-id-483'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7041,9 +7028,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-486'/>
+            <parameter type-id='type-id-484'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7052,9 +7039,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::IntType<short int, 2u> >(const OT::IntType<short int, 2u>*) -->
           <function-decl name='check_struct&lt;OT::IntType&lt;short int, 2u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::IntType<short int, 2u>*' -->
-            <parameter type-id='type-id-292'/>
+            <parameter type-id='type-id-290'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7063,9 +7050,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-487'/>
+            <parameter type-id='type-id-485'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7074,9 +7061,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-488'/>
+            <parameter type-id='type-id-486'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7085,9 +7072,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-489'/>
+            <parameter type-id='type-id-487'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7096,9 +7083,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-490'/>
+            <parameter type-id='type-id-488'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7107,9 +7094,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-491'/>
+            <parameter type-id='type-id-489'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7118,9 +7105,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-490'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7129,9 +7116,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-493'/>
+            <parameter type-id='type-id-491'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7140,9 +7127,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-494'/>
+            <parameter type-id='type-id-492'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7151,9 +7138,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-495'/>
+            <parameter type-id='type-id-493'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7162,9 +7149,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-496'/>
+            <parameter type-id='type-id-494'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7173,9 +7160,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-497'/>
+            <parameter type-id='type-id-495'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7184,9 +7171,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ContextFormat3>(const OT::ContextFormat3*) -->
           <function-decl name='check_struct&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3*' -->
-            <parameter type-id='type-id-498'/>
+            <parameter type-id='type-id-496'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7195,9 +7182,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-499'/>
+            <parameter type-id='type-id-497'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7206,9 +7193,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-500'/>
+            <parameter type-id='type-id-498'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7217,9 +7204,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-501'/>
+            <parameter type-id='type-id-499'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7228,9 +7215,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-502'/>
+            <parameter type-id='type-id-500'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7239,9 +7226,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-503'/>
+            <parameter type-id='type-id-501'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7250,9 +7237,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-504'/>
+            <parameter type-id='type-id-502'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7261,9 +7248,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ExtensionFormat1>(const OT::ExtensionFormat1*) -->
           <function-decl name='check_struct&lt;OT::ExtensionFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ExtensionFormat1*' -->
-            <parameter type-id='type-id-505'/>
+            <parameter type-id='type-id-503'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7272,9 +7259,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-506'/>
+            <parameter type-id='type-id-504'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7283,9 +7270,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-507'/>
+            <parameter type-id='type-id-505'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7294,9 +7281,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-508'/>
+            <parameter type-id='type-id-506'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7305,9 +7292,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-509'/>
+            <parameter type-id='type-id-507'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7316,9 +7303,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-508'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7327,9 +7314,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-511'/>
+            <parameter type-id='type-id-509'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7338,9 +7325,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::PairSet>(const OT::PairSet*) -->
           <function-decl name='check_struct&lt;OT::PairSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairSet*' -->
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-510'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7349,9 +7336,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-513'/>
+            <parameter type-id='type-id-511'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7360,9 +7347,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-514'/>
+            <parameter type-id='type-id-512'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7371,9 +7358,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::AnchorFormat1>(const OT::AnchorFormat1*) -->
           <function-decl name='check_struct&lt;OT::AnchorFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AnchorFormat1*' -->
-            <parameter type-id='type-id-515'/>
+            <parameter type-id='type-id-513'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7382,9 +7369,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::AnchorFormat2>(const OT::AnchorFormat2*) -->
           <function-decl name='check_struct&lt;OT::AnchorFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AnchorFormat2*' -->
-            <parameter type-id='type-id-516'/>
+            <parameter type-id='type-id-514'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7393,9 +7380,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::AnchorFormat3>(const OT::AnchorFormat3*) -->
           <function-decl name='check_struct&lt;OT::AnchorFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AnchorFormat3*' -->
-            <parameter type-id='type-id-517'/>
+            <parameter type-id='type-id-515'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7404,9 +7391,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-518'/>
+            <parameter type-id='type-id-516'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7415,9 +7402,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-519'/>
+            <parameter type-id='type-id-517'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7426,9 +7413,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::MarkRecord>(const OT::MarkRecord*) -->
           <function-decl name='check_struct&lt;OT::MarkRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkRecord*' -->
-            <parameter type-id='type-id-520'/>
+            <parameter type-id='type-id-518'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7437,9 +7424,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-521'/>
+            <parameter type-id='type-id-519'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7448,9 +7435,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::AnchorMatrix>(const OT::AnchorMatrix*) -->
           <function-decl name='check_struct&lt;OT::AnchorMatrix&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AnchorMatrix*' -->
-            <parameter type-id='type-id-522'/>
+            <parameter type-id='type-id-520'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7459,9 +7446,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-523'/>
+            <parameter type-id='type-id-521'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7470,9 +7457,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1*) -->
           <function-decl name='check_struct&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1*' -->
-            <parameter type-id='type-id-524'/>
+            <parameter type-id='type-id-522'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7481,9 +7468,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-525'/>
+            <parameter type-id='type-id-523'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7492,9 +7479,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-526'/>
+            <parameter type-id='type-id-524'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7503,9 +7490,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1*) -->
           <function-decl name='check_struct&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1*' -->
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-525'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7514,9 +7501,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1*) -->
           <function-decl name='check_struct&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1*' -->
-            <parameter type-id='type-id-528'/>
+            <parameter type-id='type-id-526'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7525,9 +7512,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::SinglePosFormat1>(const OT::SinglePosFormat1*) -->
           <function-decl name='check_struct&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1*' -->
-            <parameter type-id='type-id-529'/>
+            <parameter type-id='type-id-527'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7536,9 +7523,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::SinglePosFormat2>(const OT::SinglePosFormat2*) -->
           <function-decl name='check_struct&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2*' -->
-            <parameter type-id='type-id-530'/>
+            <parameter type-id='type-id-528'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7547,9 +7534,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::PairPosFormat1>(const OT::PairPosFormat1*) -->
           <function-decl name='check_struct&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1*' -->
-            <parameter type-id='type-id-531'/>
+            <parameter type-id='type-id-529'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7558,9 +7545,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::PairPosFormat2>(const OT::PairPosFormat2*) -->
           <function-decl name='check_struct&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2*' -->
-            <parameter type-id='type-id-532'/>
+            <parameter type-id='type-id-530'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7569,9 +7556,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-533'/>
+            <parameter type-id='type-id-531'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7580,9 +7567,9 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-534'/>
+            <parameter type-id='type-id-532'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -7591,23 +7578,23 @@
           <!-- bool OT::hb_sanitize_context_t::check_struct<OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > >(const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >*) -->
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <!-- parameter of type 'const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-535'/>
+            <parameter type-id='type-id-533'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Sanitizer<OT::OpenTypeFontFile> -->
-      <class-decl name='Sanitizer&lt;OT::OpenTypeFontFile&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-536'>
+      <class-decl name='Sanitizer&lt;OT::OpenTypeFontFile&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-534'>
         <member-function access='public' static='yes'>
           <!-- const OT::OpenTypeFontFile* OT::Sanitizer<OT::OpenTypeFontFile>::lock_instance() -->
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_16OpenTypeFontFileEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-57'/>
             <!-- const OT::OpenTypeFontFile* -->
-            <return type-id='type-id-314'/>
+            <return type-id='type-id-312'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -7621,7 +7608,7 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Sanitizer<OT::head> -->
-      <class-decl name='Sanitizer&lt;OT::head&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-537'>
+      <class-decl name='Sanitizer&lt;OT::head&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-535'>
         <member-function access='public' static='yes'>
           <!-- hb_blob_t* OT::Sanitizer<OT::head>::sanitize() -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4headEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7637,12 +7624,12 @@
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-57'/>
             <!-- const OT::head* -->
-            <return type-id='type-id-330'/>
+            <return type-id='type-id-328'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Sanitizer<OT::maxp> -->
-      <class-decl name='Sanitizer&lt;OT::maxp&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-538'>
+      <class-decl name='Sanitizer&lt;OT::maxp&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-536'>
         <member-function access='public' static='yes'>
           <!-- hb_blob_t* OT::Sanitizer<OT::maxp>::sanitize() -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4maxpEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7658,12 +7645,12 @@
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-57'/>
             <!-- const OT::maxp* -->
-            <return type-id='type-id-332'/>
+            <return type-id='type-id-330'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::hb_serialize_context_t -->
-      <class-decl name='hb_serialize_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='377' column='1' id='type-id-263'>
+      <class-decl name='hb_serialize_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='377' column='1' id='type-id-261'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned int OT::hb_serialize_context_t::debug_depth -->
           <var-decl name='debug_depth' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='480' column='1'/>
@@ -7688,7 +7675,7 @@
           <!-- OT::hb_serialize_context_t::hb_serialize_context_t(void*, unsigned int) -->
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -7701,7 +7688,7 @@
           <!-- OT::hb_serialize_context_t::hb_serialize_context_t(void*, unsigned int) -->
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -7714,7 +7701,7 @@
           <!-- OT::hb_serialize_context_t::hb_serialize_context_t(void*, unsigned int) -->
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -7727,7 +7714,7 @@
           <!-- OT::hb_serialize_context_t::hb_serialize_context_t(void*, unsigned int) -->
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -7740,499 +7727,499 @@
           <!-- OT::Coverage* OT::hb_serialize_context_t::start_embed<OT::Coverage>() -->
           <function-decl name='start_embed&lt;OT::Coverage&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- OT::Coverage* -->
-            <return type-id='type-id-539'/>
+            <return type-id='type-id-537'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::Ligature* OT::hb_serialize_context_t::start_embed<OT::Ligature>() -->
           <function-decl name='start_embed&lt;OT::Ligature&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- OT::Ligature* -->
-            <return type-id='type-id-540'/>
+            <return type-id='type-id-538'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::LigatureSet* OT::hb_serialize_context_t::start_embed<OT::LigatureSet>() -->
           <function-decl name='start_embed&lt;OT::LigatureSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- OT::LigatureSet* -->
-            <return type-id='type-id-541'/>
+            <return type-id='type-id-539'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SubstLookupSubTable* OT::hb_serialize_context_t::start_embed<OT::SubstLookupSubTable>() -->
           <function-decl name='start_embed&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- OT::SubstLookupSubTable* -->
-            <return type-id='type-id-542'/>
+            <return type-id='type-id-540'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SubstLookup* OT::hb_serialize_context_t::start_embed<OT::SubstLookup>() -->
           <function-decl name='start_embed&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- OT::SubstLookup* -->
-            <return type-id='type-id-543'/>
+            <return type-id='type-id-541'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::Lookup* OT::hb_serialize_context_t::allocate_size<OT::Lookup>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::Lookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::Lookup* -->
-            <return type-id='type-id-544'/>
+            <return type-id='type-id-542'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::allocate_size<OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-545'/>
+            <return type-id='type-id-543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend_min<OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend_min&lt;OT::ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-546'/>
+            <parameter type-id='type-id-544'/>
             <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-545'/>
+            <return type-id='type-id-543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend<OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend&lt;OT::ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-546'/>
+            <parameter type-id='type-id-544'/>
             <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-545'/>
+            <return type-id='type-id-543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::Lookup* OT::hb_serialize_context_t::extend_min<OT::Lookup>(OT::Lookup&) -->
           <function-decl name='extend_min&lt;OT::Lookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::Lookup&' -->
-            <parameter type-id='type-id-547'/>
+            <parameter type-id='type-id-545'/>
             <!-- OT::Lookup* -->
-            <return type-id='type-id-544'/>
+            <return type-id='type-id-542'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::IntType<short unsigned int, 2u>* OT::hb_serialize_context_t::allocate_size<OT::IntType<short unsigned int, 2u> >(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::IntType<short unsigned int, 2u>* -->
-            <return type-id='type-id-240'/>
+            <return type-id='type-id-238'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SingleSubstFormat1* OT::hb_serialize_context_t::allocate_size<OT::SingleSubstFormat1>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::SingleSubstFormat1* -->
-            <return type-id='type-id-548'/>
+            <return type-id='type-id-546'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::Coverage* OT::hb_serialize_context_t::allocate_size<OT::Coverage>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::Coverage&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::Coverage* -->
-            <return type-id='type-id-539'/>
+            <return type-id='type-id-537'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::CoverageFormat1* OT::hb_serialize_context_t::allocate_size<OT::CoverageFormat1>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::CoverageFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::CoverageFormat1* -->
-            <return type-id='type-id-549'/>
+            <return type-id='type-id-547'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::allocate_size<OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-550'/>
+            <return type-id='type-id-548'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::CoverageFormat1* OT::hb_serialize_context_t::extend_min<OT::CoverageFormat1>(OT::CoverageFormat1&) -->
           <function-decl name='extend_min&lt;OT::CoverageFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::CoverageFormat1&' -->
-            <parameter type-id='type-id-551'/>
+            <parameter type-id='type-id-549'/>
             <!-- OT::CoverageFormat1* -->
-            <return type-id='type-id-549'/>
+            <return type-id='type-id-547'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend<OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend&lt;OT::SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-552'/>
+            <parameter type-id='type-id-550'/>
             <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-550'/>
+            <return type-id='type-id-548'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::CoverageFormat2* OT::hb_serialize_context_t::allocate_size<OT::CoverageFormat2>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::CoverageFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::CoverageFormat2* -->
-            <return type-id='type-id-553'/>
+            <return type-id='type-id-551'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::allocate_size<OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > >(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-554'/>
+            <return type-id='type-id-552'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::CoverageFormat2* OT::hb_serialize_context_t::extend_min<OT::CoverageFormat2>(OT::CoverageFormat2&) -->
           <function-decl name='extend_min&lt;OT::CoverageFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::CoverageFormat2&' -->
-            <parameter type-id='type-id-555'/>
+            <parameter type-id='type-id-553'/>
             <!-- OT::CoverageFormat2* -->
-            <return type-id='type-id-553'/>
+            <return type-id='type-id-551'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend<OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > >(OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend&lt;OT::SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-556'/>
+            <parameter type-id='type-id-554'/>
             <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-554'/>
+            <return type-id='type-id-552'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::Coverage* OT::hb_serialize_context_t::extend_min<OT::Coverage>(OT::Coverage&) -->
           <function-decl name='extend_min&lt;OT::Coverage&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::Coverage&' -->
-            <parameter type-id='type-id-557'/>
+            <parameter type-id='type-id-555'/>
             <!-- OT::Coverage* -->
-            <return type-id='type-id-539'/>
+            <return type-id='type-id-537'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SingleSubstFormat1* OT::hb_serialize_context_t::extend_min<OT::SingleSubstFormat1>(OT::SingleSubstFormat1&) -->
           <function-decl name='extend_min&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-558'/>
+            <parameter type-id='type-id-556'/>
             <!-- OT::SingleSubstFormat1* -->
-            <return type-id='type-id-548'/>
+            <return type-id='type-id-546'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SingleSubstFormat2* OT::hb_serialize_context_t::allocate_size<OT::SingleSubstFormat2>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::SingleSubstFormat2* -->
-            <return type-id='type-id-559'/>
+            <return type-id='type-id-557'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::allocate_size<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-560'/>
+            <return type-id='type-id-558'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend_min<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend_min&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-561'/>
+            <parameter type-id='type-id-559'/>
             <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-560'/>
+            <return type-id='type-id-558'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-561'/>
+            <parameter type-id='type-id-559'/>
             <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-560'/>
+            <return type-id='type-id-558'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SingleSubstFormat2* OT::hb_serialize_context_t::extend_min<OT::SingleSubstFormat2>(OT::SingleSubstFormat2&) -->
           <function-decl name='extend_min&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-562'/>
+            <parameter type-id='type-id-560'/>
             <!-- OT::SingleSubstFormat2* -->
-            <return type-id='type-id-559'/>
+            <return type-id='type-id-557'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::LigatureSubstFormat1* OT::hb_serialize_context_t::allocate_size<OT::LigatureSubstFormat1>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::LigatureSubstFormat1* -->
-            <return type-id='type-id-563'/>
+            <return type-id='type-id-561'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::allocate_size<OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-564'/>
+            <return type-id='type-id-562'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend_min<OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend_min&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-565'/>
+            <parameter type-id='type-id-563'/>
             <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-564'/>
+            <return type-id='type-id-562'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend<OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-565'/>
+            <parameter type-id='type-id-563'/>
             <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-564'/>
+            <return type-id='type-id-562'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::LigatureSet* OT::hb_serialize_context_t::allocate_size<OT::LigatureSet>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::LigatureSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::LigatureSet* -->
-            <return type-id='type-id-541'/>
+            <return type-id='type-id-539'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::allocate_size<OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-566'/>
+            <return type-id='type-id-564'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend_min<OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend_min&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-567'/>
+            <parameter type-id='type-id-565'/>
             <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-566'/>
+            <return type-id='type-id-564'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend<OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >(OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-567'/>
+            <parameter type-id='type-id-565'/>
             <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-566'/>
+            <return type-id='type-id-564'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::Ligature* OT::hb_serialize_context_t::allocate_size<OT::Ligature>(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::Ligature&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::Ligature* -->
-            <return type-id='type-id-540'/>
+            <return type-id='type-id-538'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::allocate_size<OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(unsigned int) -->
           <function-decl name='allocate_size&lt;OT::HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-568'/>
+            <return type-id='type-id-566'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend_min<OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend_min&lt;OT::HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-569'/>
+            <parameter type-id='type-id-567'/>
             <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-568'/>
+            <return type-id='type-id-566'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* OT::hb_serialize_context_t::extend<OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > >(OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='extend&lt;OT::HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-569'/>
+            <parameter type-id='type-id-567'/>
             <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-568'/>
+            <return type-id='type-id-566'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::Ligature* OT::hb_serialize_context_t::extend_min<OT::Ligature>(OT::Ligature&) -->
           <function-decl name='extend_min&lt;OT::Ligature&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::Ligature&' -->
-            <parameter type-id='type-id-570'/>
+            <parameter type-id='type-id-568'/>
             <!-- OT::Ligature* -->
-            <return type-id='type-id-540'/>
+            <return type-id='type-id-538'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::LigatureSet* OT::hb_serialize_context_t::extend_min<OT::LigatureSet>(OT::LigatureSet&) -->
           <function-decl name='extend_min&lt;OT::LigatureSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::LigatureSet&' -->
-            <parameter type-id='type-id-571'/>
+            <parameter type-id='type-id-569'/>
             <!-- OT::LigatureSet* -->
-            <return type-id='type-id-541'/>
+            <return type-id='type-id-539'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::LigatureSubstFormat1* OT::hb_serialize_context_t::extend_min<OT::LigatureSubstFormat1>(OT::LigatureSubstFormat1&) -->
           <function-decl name='extend_min&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-572'/>
+            <parameter type-id='type-id-570'/>
             <!-- OT::LigatureSubstFormat1* -->
-            <return type-id='type-id-563'/>
+            <return type-id='type-id-561'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SubstLookup* OT::hb_serialize_context_t::start_serialize<OT::SubstLookup>() -->
           <function-decl name='start_serialize&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- OT::SubstLookup* -->
-            <return type-id='type-id-543'/>
+            <return type-id='type-id-541'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::USHORT* OT::hb_serialize_context_t::extend_min<OT::USHORT>(OT::USHORT&) -->
           <function-decl name='extend_min&lt;OT::USHORT&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'OT::USHORT&' -->
-            <parameter type-id='type-id-573'/>
+            <parameter type-id='type-id-571'/>
             <!-- OT::USHORT* -->
-            <return type-id='type-id-384'/>
+            <return type-id='type-id-382'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::SubstLookup* OT::hb_serialize_context_t::copy<OT::SubstLookup>() -->
           <function-decl name='copy&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='410' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- OT::SubstLookup* -->
-            <return type-id='type-id-543'/>
+            <return type-id='type-id-541'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::hb_serialize_context_t::end_serialize() -->
           <function-decl name='end_serialize' mangled-name='_ZN2OT22hb_serialize_context_t13end_serializeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -8241,7 +8228,7 @@
           <!-- OT::hb_serialize_context_t::hb_serialize_context_t(void*, unsigned int) -->
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -8252,23 +8239,23 @@
         </member-function>
       </class-decl>
       <!-- struct OT::BEInt<int, 4> -->
-      <class-decl name='BEInt&lt;int, 4&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-223'>
+      <class-decl name='BEInt&lt;int, 4&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-221'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<int, 4>::v[4] -->
           <var-decl name='v' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::BEInt<short int, 2> -->
-      <class-decl name='BEInt&lt;short int, 2&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-225'>
+      <class-decl name='BEInt&lt;short int, 2&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-223'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<short int, 2>::v[2] -->
-          <var-decl name='v' type-id='type-id-192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='554' column='1'/>
+          <var-decl name='v' type-id='type-id-190' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='554' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- short int OT::BEInt<short int, 2>::operator short int() -->
           <function-decl name='operator short int' mangled-name='_ZNK2OT5BEIntIsLi2EEcvsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::BEInt<short int, 2>*' -->
-            <parameter type-id='type-id-276' is-artificial='yes'/>
+            <parameter type-id='type-id-274' is-artificial='yes'/>
             <!-- short int -->
             <return type-id='type-id-72'/>
           </function-decl>
@@ -8277,7 +8264,7 @@
           <!-- void OT::BEInt<short int, 2>::set(short int) -->
           <function-decl name='set' mangled-name='_ZN2OT5BEIntIsLi2EE3setEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::BEInt<short int, 2>*' -->
-            <parameter type-id='type-id-226' is-artificial='yes'/>
+            <parameter type-id='type-id-224' is-artificial='yes'/>
             <!-- parameter of type 'short int' -->
             <parameter type-id='type-id-72'/>
             <!-- void -->
@@ -8286,16 +8273,16 @@
         </member-function>
       </class-decl>
       <!-- struct OT::BEInt<short unsigned int, 2> -->
-      <class-decl name='BEInt&lt;short unsigned int, 2&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-227'>
+      <class-decl name='BEInt&lt;short unsigned int, 2&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-225'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<short unsigned int, 2>::v[2] -->
-          <var-decl name='v' type-id='type-id-192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='554' column='1'/>
+          <var-decl name='v' type-id='type-id-190' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='554' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned short int OT::BEInt<short unsigned int, 2>::operator short unsigned int() -->
           <function-decl name='operator short unsigned int' mangled-name='_ZNK2OT5BEIntItLi2EEcvtEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::BEInt<short unsigned int, 2>*' -->
-            <parameter type-id='type-id-279' is-artificial='yes'/>
+            <parameter type-id='type-id-277' is-artificial='yes'/>
             <!-- unsigned short int -->
             <return type-id='type-id-81'/>
           </function-decl>
@@ -8304,7 +8291,7 @@
           <!-- void OT::BEInt<short unsigned int, 2>::set(unsigned short int) -->
           <function-decl name='set' mangled-name='_ZN2OT5BEIntItLi2EE3setEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::BEInt<short unsigned int, 2>*' -->
-            <parameter type-id='type-id-228' is-artificial='yes'/>
+            <parameter type-id='type-id-226' is-artificial='yes'/>
             <!-- parameter of type 'unsigned short int' -->
             <parameter type-id='type-id-81'/>
             <!-- void -->
@@ -8313,7 +8300,7 @@
         </member-function>
       </class-decl>
       <!-- struct OT::BEInt<unsigned int, 4> -->
-      <class-decl name='BEInt&lt;unsigned int, 4&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-229'>
+      <class-decl name='BEInt&lt;unsigned int, 4&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-227'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<unsigned int, 4>::v[4] -->
           <var-decl name='v' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
@@ -8322,7 +8309,7 @@
           <!-- unsigned int OT::BEInt<unsigned int, 4>::operator unsigned int() -->
           <function-decl name='operator unsigned int' mangled-name='_ZNK2OT5BEIntIjLi4EEcvjEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='592' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::BEInt<unsigned int, 4>*' -->
-            <parameter type-id='type-id-282' is-artificial='yes'/>
+            <parameter type-id='type-id-280' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -8331,7 +8318,7 @@
           <!-- void OT::BEInt<unsigned int, 4>::set(unsigned int) -->
           <function-decl name='set' mangled-name='_ZN2OT5BEIntIjLi4EE3setEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::BEInt<unsigned int, 4>*' -->
-            <parameter type-id='type-id-230' is-artificial='yes'/>
+            <parameter type-id='type-id-228' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -8342,19 +8329,19 @@
           <!-- bool OT::BEInt<unsigned int, 4>::operator==(const OT::BEInt<unsigned int, 4>&) -->
           <function-decl name='operator==' mangled-name='_ZNK2OT5BEIntIjLi4EEeqERKS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='599' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::BEInt<unsigned int, 4>*' -->
-            <parameter type-id='type-id-282' is-artificial='yes'/>
+            <parameter type-id='type-id-280' is-artificial='yes'/>
             <!-- parameter of type 'const OT::BEInt<unsigned int, 4>&' -->
-            <parameter type-id='type-id-281'/>
+            <parameter type-id='type-id-279'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::IntType<int, 4u> -->
-      <class-decl name='IntType&lt;int, 4u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-235'>
+      <class-decl name='IntType&lt;int, 4u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-233'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::BEInt<int, 4> OT::IntType<int, 4u>::v -->
-          <var-decl name='v' type-id='type-id-223' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-221' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<int, 4u>::static_size -->
@@ -8366,10 +8353,10 @@
         </data-member>
       </class-decl>
       <!-- struct OT::IntType<short int, 2u> -->
-      <class-decl name='IntType&lt;short int, 2u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-237'>
+      <class-decl name='IntType&lt;short int, 2u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-235'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::BEInt<short int, 2> OT::IntType<short int, 2u>::v -->
-          <var-decl name='v' type-id='type-id-225' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-223' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<short int, 2u>::static_size -->
@@ -8383,7 +8370,7 @@
           <!-- short int OT::IntType<short int, 2u>::operator short int() -->
           <function-decl name='operator short int' mangled-name='_ZNK2OT7IntTypeIsLj2EEcvsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<short int, 2u>*' -->
-            <parameter type-id='type-id-292' is-artificial='yes'/>
+            <parameter type-id='type-id-290' is-artificial='yes'/>
             <!-- short int -->
             <return type-id='type-id-72'/>
           </function-decl>
@@ -8392,9 +8379,9 @@
           <!-- bool OT::IntType<short int, 2u>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7IntTypeIsLj2EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::IntType<short int, 2u>*' -->
-            <parameter type-id='type-id-238' is-artificial='yes'/>
+            <parameter type-id='type-id-236' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8403,7 +8390,7 @@
           <!-- void OT::IntType<short int, 2u>::set(short int) -->
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeIsLj2EE3setEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::IntType<short int, 2u>*' -->
-            <parameter type-id='type-id-238' is-artificial='yes'/>
+            <parameter type-id='type-id-236' is-artificial='yes'/>
             <!-- parameter of type 'short int' -->
             <parameter type-id='type-id-72'/>
             <!-- void -->
@@ -8412,10 +8399,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::IntType<short unsigned int, 2u> -->
-      <class-decl name='IntType&lt;short unsigned int, 2u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-239'>
+      <class-decl name='IntType&lt;short unsigned int, 2u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-237'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::BEInt<short unsigned int, 2> OT::IntType<short unsigned int, 2u>::v -->
-          <var-decl name='v' type-id='type-id-227' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-225' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<short unsigned int, 2u>::static_size -->
@@ -8429,7 +8416,7 @@
           <!-- unsigned short int OT::IntType<short unsigned int, 2u>::operator short unsigned int() -->
           <function-decl name='operator short unsigned int' mangled-name='_ZNK2OT7IntTypeItLj2EEcvtEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295' is-artificial='yes'/>
+            <parameter type-id='type-id-293' is-artificial='yes'/>
             <!-- unsigned short int -->
             <return type-id='type-id-81'/>
           </function-decl>
@@ -8438,9 +8425,9 @@
           <!-- int OT::IntType<short unsigned int, 2u>::cmp(OT::IntType<short unsigned int, 2u>) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeItLj2EE3cmpES1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='619' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295' is-artificial='yes'/>
+            <parameter type-id='type-id-293' is-artificial='yes'/>
             <!-- parameter of type 'struct OT::IntType<short unsigned int, 2u>' -->
-            <parameter type-id='type-id-239'/>
+            <parameter type-id='type-id-237'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -8449,7 +8436,7 @@
           <!-- void OT::IntType<short unsigned int, 2u>::set(unsigned short int) -->
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeItLj2EE3setEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-240' is-artificial='yes'/>
+            <parameter type-id='type-id-238' is-artificial='yes'/>
             <!-- parameter of type 'unsigned short int' -->
             <parameter type-id='type-id-81'/>
             <!-- void -->
@@ -8460,9 +8447,9 @@
           <!-- bool OT::IntType<short unsigned int, 2u>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7IntTypeItLj2EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-240' is-artificial='yes'/>
+            <parameter type-id='type-id-238' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8471,7 +8458,7 @@
           <!-- int OT::IntType<short unsigned int, 2u>::cmp(unsigned short int) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeItLj2EE3cmpEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295' is-artificial='yes'/>
+            <parameter type-id='type-id-293' is-artificial='yes'/>
             <!-- parameter of type 'unsigned short int' -->
             <parameter type-id='type-id-81'/>
             <!-- int -->
@@ -8482,19 +8469,19 @@
           <!-- int OT::IntType<short unsigned int, 2u>::cmp(const OT::IntType<short unsigned int, 2u>*) -->
           <function-decl name='cmp' mangled-name='_ZN2OT7IntTypeItLj2EE3cmpEPKS1_S3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-293'/>
             <!-- parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-293'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::IntType<unsigned int, 4u> -->
-      <class-decl name='IntType&lt;unsigned int, 4u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-241'>
+      <class-decl name='IntType&lt;unsigned int, 4u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-239'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::BEInt<unsigned int, 4> OT::IntType<unsigned int, 4u>::v -->
-          <var-decl name='v' type-id='type-id-229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-227' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<unsigned int, 4u>::static_size -->
@@ -8508,7 +8495,7 @@
           <!-- void OT::IntType<unsigned int, 4u>::set(unsigned int) -->
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeIjLj4EE3setEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::IntType<unsigned int, 4u>*' -->
-            <parameter type-id='type-id-242' is-artificial='yes'/>
+            <parameter type-id='type-id-240' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -8519,9 +8506,9 @@
           <!-- bool OT::IntType<unsigned int, 4u>::operator==(const OT::IntType<unsigned int, 4u>&) -->
           <function-decl name='operator==' mangled-name='_ZNK2OT7IntTypeIjLj4EEeqERKS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='616' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<unsigned int, 4u>*' -->
-            <parameter type-id='type-id-298' is-artificial='yes'/>
+            <parameter type-id='type-id-296' is-artificial='yes'/>
             <!-- parameter of type 'const OT::IntType<unsigned int, 4u>&' -->
-            <parameter type-id='type-id-297'/>
+            <parameter type-id='type-id-295'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8530,7 +8517,7 @@
           <!-- unsigned int OT::IntType<unsigned int, 4u>::operator unsigned int() -->
           <function-decl name='operator unsigned int' mangled-name='_ZNK2OT7IntTypeIjLj4EEcvjEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<unsigned int, 4u>*' -->
-            <parameter type-id='type-id-298' is-artificial='yes'/>
+            <parameter type-id='type-id-296' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -8539,9 +8526,9 @@
           <!-- bool OT::IntType<unsigned int, 4u>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7IntTypeIjLj4EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::IntType<unsigned int, 4u>*' -->
-            <parameter type-id='type-id-242' is-artificial='yes'/>
+            <parameter type-id='type-id-240' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8550,7 +8537,7 @@
           <!-- int OT::IntType<unsigned int, 4u>::cmp(unsigned int) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeIjLj4EE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<unsigned int, 4u>*' -->
-            <parameter type-id='type-id-298' is-artificial='yes'/>
+            <parameter type-id='type-id-296' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- int -->
@@ -8559,14 +8546,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::LONGDATETIME -->
-      <class-decl name='LONGDATETIME' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='647' column='1' id='type-id-243'>
+      <class-decl name='LONGDATETIME' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='647' column='1' id='type-id-241'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::LONG OT::LONGDATETIME::major -->
-          <var-decl name='major' type-id='type-id-574' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='653' column='1'/>
+          <var-decl name='major' type-id='type-id-572' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='653' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ULONG OT::LONGDATETIME::minor -->
-          <var-decl name='minor' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='654' column='1'/>
+          <var-decl name='minor' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='654' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LONGDATETIME::static_size -->
@@ -8578,9 +8565,9 @@
         </data-member>
       </class-decl>
       <!-- struct OT::Tag -->
-      <class-decl name='Tag' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='662' column='1' id='type-id-259'>
+      <class-decl name='Tag' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='662' column='1' id='type-id-257'>
         <!-- struct OT::IntType<unsigned int, 4u> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-241'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-239'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Tag::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
@@ -8591,9 +8578,9 @@
         </data-member>
       </class-decl>
       <!-- struct OT::Offset<OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='Offset&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-301'>
+      <class-decl name='Offset&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-299'>
         <!-- struct OT::IntType<unsigned int, 4u> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-241'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-239'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Offset<OT::IntType<unsigned int, 4u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
@@ -8604,9 +8591,9 @@
         </data-member>
       </class-decl>
       <!-- struct OT::CheckSum -->
-      <class-decl name='CheckSum' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='692' column='1' id='type-id-231'>
+      <class-decl name='CheckSum' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='692' column='1' id='type-id-229'>
         <!-- struct OT::IntType<unsigned int, 4u> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-241'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-239'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CheckSum::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
@@ -8617,14 +8604,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::FixedVersion -->
-      <class-decl name='FixedVersion' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='718' column='1' id='type-id-233'>
+      <class-decl name='FixedVersion' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='718' column='1' id='type-id-231'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FixedVersion::major -->
-          <var-decl name='major' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='726' column='1'/>
+          <var-decl name='major' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='726' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::FixedVersion::minor -->
-          <var-decl name='minor' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='727' column='1'/>
+          <var-decl name='minor' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='727' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FixedVersion::static_size -->
@@ -8638,9 +8625,9 @@
           <!-- bool OT::FixedVersion::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12FixedVersion8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='721' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::FixedVersion*' -->
-            <parameter type-id='type-id-234' is-artificial='yes'/>
+            <parameter type-id='type-id-232' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8649,16 +8636,16 @@
           <!-- uint32_t OT::FixedVersion::to_int() -->
           <function-decl name='to_int' mangled-name='_ZNK2OT12FixedVersion6to_intEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='719' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::FixedVersion*' -->
-            <parameter type-id='type-id-286' is-artificial='yes'/>
+            <parameter type-id='type-id-284' is-artificial='yes'/>
             <!-- typedef uint32_t -->
             <return type-id='type-id-100'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-188'>
+      <class-decl name='OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-186'>
         <!-- struct OT::Offset<OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8671,9 +8658,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-249' is-artificial='yes'/>
+            <parameter type-id='type-id-247' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8682,9 +8669,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-249' is-artificial='yes'/>
+            <parameter type-id='type-id-247' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -8695,23 +8682,23 @@
           <!-- const OT::OffsetTable& OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-309' is-artificial='yes'/>
+            <parameter type-id='type-id-307' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::OffsetTable& -->
-            <return type-id='type-id-305'/>
+            <return type-id='type-id-303'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-221'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-219'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::len -->
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> > OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-189' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -8721,9 +8708,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-222' is-artificial='yes'/>
+            <parameter type-id='type-id-220' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8732,9 +8719,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-222' is-artificial='yes'/>
+            <parameter type-id='type-id-220' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -8745,87 +8732,87 @@
           <!-- const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >& OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-270' is-artificial='yes'/>
+            <parameter type-id='type-id-268' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >& -->
-            <return type-id='type-id-308'/>
+            <return type-id='type-id-306'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::head -->
-      <class-decl name='head' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='45' column='1' id='type-id-265'>
+      <class-decl name='head' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='45' column='1' id='type-id-263'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::head::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='46' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='46' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::FixedVersion OT::head::version -->
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='60' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::FixedVersion OT::head::fontRevision -->
-          <var-decl name='fontRevision' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='62' column='1'/>
+          <var-decl name='fontRevision' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ULONG OT::head::checkSumAdjustment -->
-          <var-decl name='checkSumAdjustment' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='63' column='1'/>
+          <var-decl name='checkSumAdjustment' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='63' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::ULONG OT::head::magicNumber -->
-          <var-decl name='magicNumber' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='66' column='1'/>
+          <var-decl name='magicNumber' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <!-- OT::USHORT OT::head::flags -->
-          <var-decl name='flags' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='67' column='1'/>
+          <var-decl name='flags' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='67' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='144'>
           <!-- OT::USHORT OT::head::unitsPerEm -->
-          <var-decl name='unitsPerEm' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='113' column='1'/>
+          <var-decl name='unitsPerEm' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='113' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='160'>
           <!-- OT::LONGDATETIME OT::head::created -->
-          <var-decl name='created' type-id='type-id-243' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='116' column='1'/>
+          <var-decl name='created' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='116' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='224'>
           <!-- OT::LONGDATETIME OT::head::modified -->
-          <var-decl name='modified' type-id='type-id-243' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='118' column='1'/>
+          <var-decl name='modified' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='118' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='288'>
           <!-- OT::SHORT OT::head::xMin -->
-          <var-decl name='xMin' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='120' column='1'/>
+          <var-decl name='xMin' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='120' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='304'>
           <!-- OT::SHORT OT::head::yMin -->
-          <var-decl name='yMin' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='121' column='1'/>
+          <var-decl name='yMin' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='320'>
           <!-- OT::SHORT OT::head::xMax -->
-          <var-decl name='xMax' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='122' column='1'/>
+          <var-decl name='xMax' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='122' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='336'>
           <!-- OT::SHORT OT::head::yMax -->
-          <var-decl name='yMax' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='123' column='1'/>
+          <var-decl name='yMax' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='123' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='352'>
           <!-- OT::USHORT OT::head::macStyle -->
-          <var-decl name='macStyle' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='124' column='1'/>
+          <var-decl name='macStyle' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='124' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='368'>
           <!-- OT::USHORT OT::head::lowestRecPPEM -->
-          <var-decl name='lowestRecPPEM' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='132' column='1'/>
+          <var-decl name='lowestRecPPEM' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='132' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='384'>
           <!-- OT::SHORT OT::head::fontDirectionHint -->
-          <var-decl name='fontDirectionHint' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='133' column='1'/>
+          <var-decl name='fontDirectionHint' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='133' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='400'>
           <!-- OT::SHORT OT::head::indexToLocFormat -->
-          <var-decl name='indexToLocFormat' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='139' column='1'/>
+          <var-decl name='indexToLocFormat' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='139' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='416'>
           <!-- OT::SHORT OT::head::glyphDataFormat -->
-          <var-decl name='glyphDataFormat' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='140' column='1'/>
+          <var-decl name='glyphDataFormat' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='140' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::head::static_size -->
@@ -8839,9 +8826,9 @@
           <!-- bool OT::head::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4head8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::head*' -->
-            <parameter type-id='type-id-266' is-artificial='yes'/>
+            <parameter type-id='type-id-264' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8850,25 +8837,25 @@
           <!-- unsigned int OT::head::get_upem() -->
           <function-decl name='get_upem' mangled-name='_ZNK2OT4head8get_upemEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::head*' -->
-            <parameter type-id='type-id-330' is-artificial='yes'/>
+            <parameter type-id='type-id-328' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::maxp -->
-      <class-decl name='maxp' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='43' column='1' id='type-id-267'>
+      <class-decl name='maxp' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='43' column='1' id='type-id-265'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::maxp::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='44' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='44' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::FixedVersion OT::maxp::version -->
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='58' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='58' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::maxp::numGlyphs -->
-          <var-decl name='numGlyphs' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='60' column='1'/>
+          <var-decl name='numGlyphs' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::maxp::static_size -->
@@ -8882,7 +8869,7 @@
           <!-- unsigned int OT::maxp::get_num_glyphs() -->
           <function-decl name='get_num_glyphs' mangled-name='_ZNK2OT4maxp14get_num_glyphsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::maxp*' -->
-            <parameter type-id='type-id-332' is-artificial='yes'/>
+            <parameter type-id='type-id-330' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -8891,46 +8878,46 @@
           <!-- bool OT::maxp::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4maxp8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::maxp*' -->
-            <parameter type-id='type-id-268' is-artificial='yes'/>
+            <parameter type-id='type-id-266' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-252'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-250'/>
       <!-- typedef OT::OffsetTable OT::OpenTypeFontFace -->
-      <typedef-decl name='OpenTypeFontFace' type-id='type-id-245' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='119' column='1' id='type-id-310'/>
+      <typedef-decl name='OpenTypeFontFace' type-id='type-id-243' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='119' column='1' id='type-id-308'/>
       <!-- typedef OT::IntType<short unsigned int, 2u> OT::USHORT -->
-      <typedef-decl name='USHORT' type-id='type-id-239' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='632' column='1' id='type-id-373'/>
+      <typedef-decl name='USHORT' type-id='type-id-237' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='632' column='1' id='type-id-371'/>
       <!-- typedef OT::IntType<short int, 2u> OT::SHORT -->
-      <typedef-decl name='SHORT' type-id='type-id-237' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='633' column='1' id='type-id-575'/>
+      <typedef-decl name='SHORT' type-id='type-id-235' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='633' column='1' id='type-id-573'/>
       <!-- typedef OT::IntType<unsigned int, 4u> OT::ULONG -->
-      <typedef-decl name='ULONG' type-id='type-id-241' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='634' column='1' id='type-id-324'/>
+      <typedef-decl name='ULONG' type-id='type-id-239' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='634' column='1' id='type-id-322'/>
       <!-- typedef OT::IntType<int, 4u> OT::LONG -->
-      <typedef-decl name='LONG' type-id='type-id-235' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='635' column='1' id='type-id-574'/>
+      <typedef-decl name='LONG' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='635' column='1' id='type-id-572'/>
     </namespace-decl>
     <!-- typedef hb_shape_plan_t hb_shape_plan_t -->
-    <typedef-decl name='hb_shape_plan_t' type-id='type-id-217' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.h' line='39' column='1' id='type-id-352'/>
+    <typedef-decl name='hb_shape_plan_t' type-id='type-id-215' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.h' line='39' column='1' id='type-id-350'/>
     <!-- typedef hb_feature_t hb_feature_t -->
-    <typedef-decl name='hb_feature_t' type-id='type-id-220' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='48' column='1' id='type-id-334'/>
+    <typedef-decl name='hb_feature_t' type-id='type-id-218' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='48' column='1' id='type-id-332'/>
     <!-- typedef typedef hb_bool_t (hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) hb_shape_func_t -->
-    <typedef-decl name='hb_shape_func_t' type-id='type-id-576' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-351'/>
+    <typedef-decl name='hb_shape_func_t' type-id='type-id-574' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-349'/>
     <!-- hb_blob_t* (hb_face_t*, hb_tag_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-346'>
+    <function-type size-in-bits='64' id='type-id-344'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-160'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-185'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- hb_blob_t* -->
       <return type-id='type-id-57'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-353'>
+    <function-type size-in-bits='64' id='type-id-351'>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147'/>
       <!-- parameter of type 'void*' -->
@@ -8947,7 +8934,7 @@
       <return type-id='type-id-35'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
-    <function-type size-in-bits='64' id='type-id-355'>
+    <function-type size-in-bits='64' id='type-id-353'>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147'/>
       <!-- parameter of type 'void*' -->
@@ -8964,7 +8951,7 @@
       <return type-id='type-id-35'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-357'>
+    <function-type size-in-bits='64' id='type-id-355'>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147'/>
       <!-- parameter of type 'void*' -->
@@ -8972,14 +8959,14 @@
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64'/>
       <!-- parameter of type 'hb_glyph_extents_t*' -->
-      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-164'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-359'>
+    <function-type size-in-bits='64' id='type-id-357'>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147'/>
       <!-- parameter of type 'void*' -->
@@ -8987,16 +8974,16 @@
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-361'>
+    <function-type size-in-bits='64' id='type-id-359'>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147'/>
       <!-- parameter of type 'void*' -->
@@ -9012,6 +8999,21 @@
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-type>
+    <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
+    <function-type size-in-bits='64' id='type-id-361'>
+      <!-- parameter of type 'hb_font_t*' -->
+      <parameter type-id='type-id-147'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-17'/>
+      <!-- parameter of type 'typedef hb_codepoint_t' -->
+      <parameter type-id='type-id-64'/>
+      <!-- parameter of type 'typedef hb_codepoint_t' -->
+      <parameter type-id='type-id-64'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-17'/>
+      <!-- typedef hb_position_t -->
+      <return type-id='type-id-103'/>
+    </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-363'>
       <!-- parameter of type 'hb_font_t*' -->
@@ -9023,30 +9025,15 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-type>
-    <!-- hb_bool_t (hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-576'>
-      <!-- parameter of type 'hb_shape_plan_t*' -->
-      <parameter type-id='type-id-195'/>
-      <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-147'/>
-      <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-145'/>
-      <!-- parameter of type 'const hb_feature_t*' -->
-      <parameter type-id='type-id-336'/>
-      <!-- parameter of type 'unsigned int' -->
-      <parameter type-id='type-id-12'/>
-      <!-- typedef hb_bool_t -->
-      <return type-id='type-id-35'/>
-    </function-type>
-    <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
+    <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, void*) -->
     <function-type size-in-bits='64' id='type-id-365'>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147'/>
@@ -9054,58 +9041,58 @@
       <parameter type-id='type-id-17'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64'/>
-      <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-64'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- typedef hb_position_t -->
       <return type-id='type-id-103'/>
     </function-type>
-    <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-367'>
+    <!-- hb_bool_t (hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) -->
+    <function-type size-in-bits='64' id='type-id-574'>
+      <!-- parameter of type 'hb_shape_plan_t*' -->
+      <parameter type-id='type-id-193'/>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
-      <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-64'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
-      <!-- typedef hb_position_t -->
-      <return type-id='type-id-103'/>
+      <!-- parameter of type 'hb_buffer_t*' -->
+      <parameter type-id='type-id-145'/>
+      <!-- parameter of type 'const hb_feature_t*' -->
+      <parameter type-id='type-id-334'/>
+      <!-- parameter of type 'unsigned int' -->
+      <parameter type-id='type-id-12'/>
+      <!-- typedef hb_bool_t -->
+      <return type-id='type-id-35'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- int* -->
-    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-577'/>
+    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-575'/>
     <!-- hb_font_funcs_t* hb_font_funcs_create() -->
     <function-decl name='hb_font_funcs_create' mangled-name='hb_font_funcs_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_create'>
       <!-- hb_font_funcs_t* -->
-      <return type-id='type-id-163'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <!-- hb_font_funcs_t* hb_font_funcs_get_empty() -->
     <function-decl name='hb_font_funcs_get_empty' mangled-name='hb_font_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_empty'>
       <!-- hb_font_funcs_t* -->
-      <return type-id='type-id-163'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <!-- hb_font_funcs_t* hb_font_funcs_reference(hb_font_funcs_t*) -->
     <function-decl name='hb_font_funcs_reference' mangled-name='hb_font_funcs_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_reference'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1'/>
       <!-- hb_font_funcs_t* -->
-      <return type-id='type-id-163'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <!-- void hb_font_funcs_destroy(hb_font_funcs_t*) -->
     <function-decl name='hb_font_funcs_destroy' mangled-name='hb_font_funcs_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_destroy'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='294' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='294' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_font_funcs_set_user_data(hb_font_funcs_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_font_funcs_set_user_data' mangled-name='hb_font_funcs_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_user_data'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='322' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9120,7 +9107,7 @@
     <!-- void* hb_font_funcs_get_user_data(hb_font_funcs_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_font_funcs_get_user_data' mangled-name='hb_font_funcs_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_user_data'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='343' column='1'/>
       <!-- void* -->
@@ -9129,23 +9116,23 @@
     <!-- void hb_font_funcs_make_immutable(hb_font_funcs_t*) -->
     <function-decl name='hb_font_funcs_make_immutable' mangled-name='hb_font_funcs_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_make_immutable'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_font_funcs_is_immutable(hb_font_funcs_t*) -->
     <function-decl name='hb_font_funcs_is_immutable' mangled-name='hb_font_funcs_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_is_immutable'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- void hb_font_funcs_set_glyph_contour_point_func(hb_font_funcs_t*, hb_font_get_glyph_contour_point_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_contour_point_func' mangled-name='hb_font_funcs_set_glyph_contour_point_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_contour_point_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_contour_point_func_t' -->
-      <parameter type-id='type-id-209' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-207' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9156,9 +9143,9 @@
     <!-- void hb_font_funcs_set_glyph_extents_func(hb_font_funcs_t*, hb_font_get_glyph_extents_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_extents_func' mangled-name='hb_font_funcs_set_glyph_extents_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_extents_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_extents_func_t' -->
-      <parameter type-id='type-id-208' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-206' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9169,9 +9156,9 @@
     <!-- void hb_font_funcs_set_glyph_from_name_func(hb_font_funcs_t*, hb_font_get_glyph_from_name_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_from_name_func' mangled-name='hb_font_funcs_set_glyph_from_name_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_from_name_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_from_name_func_t' -->
-      <parameter type-id='type-id-211' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-209' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9182,9 +9169,9 @@
     <!-- void hb_font_funcs_set_glyph_func(hb_font_funcs_t*, hb_font_get_glyph_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_func' mangled-name='hb_font_funcs_set_glyph_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_func_t' -->
-      <parameter type-id='type-id-201' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-199' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9195,9 +9182,9 @@
     <!-- void hb_font_funcs_set_glyph_h_advance_func(hb_font_funcs_t*, hb_font_get_glyph_h_advance_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_h_advance_func' mangled-name='hb_font_funcs_set_glyph_h_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_advance_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_h_advance_func_t' -->
-      <parameter type-id='type-id-202' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-200' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9208,9 +9195,9 @@
     <!-- void hb_font_funcs_set_glyph_h_kerning_func(hb_font_funcs_t*, hb_font_get_glyph_h_kerning_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_h_kerning_func' mangled-name='hb_font_funcs_set_glyph_h_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_kerning_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_h_kerning_func_t' -->
-      <parameter type-id='type-id-206' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-204' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9221,9 +9208,9 @@
     <!-- void hb_font_funcs_set_glyph_h_origin_func(hb_font_funcs_t*, hb_font_get_glyph_h_origin_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_h_origin_func' mangled-name='hb_font_funcs_set_glyph_h_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_origin_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_h_origin_func_t' -->
-      <parameter type-id='type-id-204' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-202' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9234,9 +9221,9 @@
     <!-- void hb_font_funcs_set_glyph_name_func(hb_font_funcs_t*, hb_font_get_glyph_name_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_name_func' mangled-name='hb_font_funcs_set_glyph_name_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_name_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_name_func_t' -->
-      <parameter type-id='type-id-210' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-208' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9247,9 +9234,9 @@
     <!-- void hb_font_funcs_set_glyph_v_advance_func(hb_font_funcs_t*, hb_font_get_glyph_v_advance_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_v_advance_func' mangled-name='hb_font_funcs_set_glyph_v_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_advance_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_advance_func_t' -->
-      <parameter type-id='type-id-203' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-201' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9260,9 +9247,9 @@
     <!-- void hb_font_funcs_set_glyph_v_kerning_func(hb_font_funcs_t*, hb_font_get_glyph_v_kerning_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_v_kerning_func' mangled-name='hb_font_funcs_set_glyph_v_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_kerning_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_kerning_func_t' -->
-      <parameter type-id='type-id-207' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-205' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9273,9 +9260,9 @@
     <!-- void hb_font_funcs_set_glyph_v_origin_func(hb_font_funcs_t*, hb_font_get_glyph_v_origin_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_v_origin_func' mangled-name='hb_font_funcs_set_glyph_v_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_origin_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_origin_func_t' -->
-      <parameter type-id='type-id-205' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-203' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9321,9 +9308,9 @@
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
@@ -9334,9 +9321,9 @@
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='510' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
@@ -9369,7 +9356,7 @@
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
       <!-- parameter of type 'hb_glyph_extents_t*' -->
-      <parameter type-id='type-id-166' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
+      <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
@@ -9382,9 +9369,9 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
@@ -9423,9 +9410,9 @@
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -9438,9 +9425,9 @@
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='677' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -9453,9 +9440,9 @@
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='698' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -9468,9 +9455,9 @@
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='719' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -9485,9 +9472,9 @@
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='741' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -9500,7 +9487,7 @@
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='763' column='1'/>
       <!-- parameter of type 'hb_glyph_extents_t*' -->
-      <parameter type-id='type-id-166' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
+      <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
@@ -9515,9 +9502,9 @@
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='787' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
@@ -9550,7 +9537,7 @@
     <!-- hb_font_t* hb_font_create(hb_face_t*) -->
     <function-decl name='hb_font_create' mangled-name='hb_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
       <!-- hb_font_t* -->
       <return type-id='type-id-147'/>
     </function-decl>
@@ -9630,14 +9617,14 @@
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- void hb_font_set_funcs(hb_font_t*, hb_font_funcs_t*, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_set_funcs' mangled-name='hb_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-163' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
+      <parameter type-id='type-id-161' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1106' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9672,9 +9659,9 @@
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
       <!-- parameter of type 'int*' -->
-      <parameter type-id='type-id-577' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
+      <parameter type-id='type-id-575' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
       <!-- parameter of type 'int*' -->
-      <parameter type-id='type-id-577' name='y_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1193' column='1'/>
+      <parameter type-id='type-id-575' name='y_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1193' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -9703,65 +9690,65 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- struct FT_Glyph_Metrics_ -->
-    <class-decl name='FT_Glyph_Metrics_' size-in-bits='512' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='280' column='1' id='type-id-578'>
+    <class-decl name='FT_Glyph_Metrics_' size-in-bits='512' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='280' column='1' id='type-id-576'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_Pos FT_Glyph_Metrics_::width -->
-        <var-decl name='width' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='281' column='1'/>
+        <var-decl name='width' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='281' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Pos FT_Glyph_Metrics_::height -->
-        <var-decl name='height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='282' column='1'/>
+        <var-decl name='height' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='282' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- FT_Pos FT_Glyph_Metrics_::horiBearingX -->
-        <var-decl name='horiBearingX' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='284' column='1'/>
+        <var-decl name='horiBearingX' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='284' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_Pos FT_Glyph_Metrics_::horiBearingY -->
-        <var-decl name='horiBearingY' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='285' column='1'/>
+        <var-decl name='horiBearingY' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='285' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- FT_Pos FT_Glyph_Metrics_::horiAdvance -->
-        <var-decl name='horiAdvance' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='286' column='1'/>
+        <var-decl name='horiAdvance' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='286' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- FT_Pos FT_Glyph_Metrics_::vertBearingX -->
-        <var-decl name='vertBearingX' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='288' column='1'/>
+        <var-decl name='vertBearingX' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='288' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FT_Pos FT_Glyph_Metrics_::vertBearingY -->
-        <var-decl name='vertBearingY' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='289' column='1'/>
+        <var-decl name='vertBearingY' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='289' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- FT_Pos FT_Glyph_Metrics_::vertAdvance -->
-        <var-decl name='vertAdvance' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='290' column='1'/>
+        <var-decl name='vertAdvance' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='290' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_Bitmap_Size_ -->
-    <class-decl name='FT_Bitmap_Size_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='334' column='1' id='type-id-580'>
+    <class-decl name='FT_Bitmap_Size_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='334' column='1' id='type-id-578'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_Short FT_Bitmap_Size_::height -->
-        <var-decl name='height' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='335' column='1'/>
+        <var-decl name='height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='335' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <!-- FT_Short FT_Bitmap_Size_::width -->
-        <var-decl name='width' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='336' column='1'/>
+        <var-decl name='width' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='336' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Pos FT_Bitmap_Size_::size -->
-        <var-decl name='size' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='338' column='1'/>
+        <var-decl name='size' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- FT_Pos FT_Bitmap_Size_::x_ppem -->
-        <var-decl name='x_ppem' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='340' column='1'/>
+        <var-decl name='x_ppem' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='340' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_Pos FT_Bitmap_Size_::y_ppem -->
-        <var-decl name='y_ppem' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='341' column='1'/>
+        <var-decl name='y_ppem' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='341' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum FT_Encoding_ -->
-    <enum-decl name='FT_Encoding_' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='698' column='1' id='type-id-582'>
+    <enum-decl name='FT_Encoding_' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='698' column='1' id='type-id-580'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='FT_ENCODING_NONE' value='0'/>
       <enumerator name='FT_ENCODING_MS_SYMBOL' value='1937337698'/>
@@ -9784,141 +9771,141 @@
       <enumerator name='FT_ENCODING_APPLE_ROMAN' value='1634889070'/>
     </enum-decl>
     <!-- struct FT_CharMapRec_ -->
-    <class-decl name='FT_CharMapRec_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='780' column='1' id='type-id-583'>
+    <class-decl name='FT_CharMapRec_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='780' column='1' id='type-id-581'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_Face FT_CharMapRec_::face -->
-        <var-decl name='face' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='781' column='1'/>
+        <var-decl name='face' type-id='type-id-582' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='781' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Encoding FT_CharMapRec_::encoding -->
-        <var-decl name='encoding' type-id='type-id-585' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='782' column='1'/>
+        <var-decl name='encoding' type-id='type-id-583' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='782' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- FT_UShort FT_CharMapRec_::platform_id -->
-        <var-decl name='platform_id' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='783' column='1'/>
+        <var-decl name='platform_id' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='783' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
         <!-- FT_UShort FT_CharMapRec_::encoding_id -->
-        <var-decl name='encoding_id' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='784' column='1'/>
+        <var-decl name='encoding_id' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='784' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_FaceRec_ -->
-    <class-decl name='FT_FaceRec_' size-in-bits='1984' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='959' column='1' id='type-id-587'>
+    <class-decl name='FT_FaceRec_' size-in-bits='1984' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='959' column='1' id='type-id-585'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_Long FT_FaceRec_::num_faces -->
-        <var-decl name='num_faces' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='960' column='1'/>
+        <var-decl name='num_faces' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='960' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Long FT_FaceRec_::face_index -->
-        <var-decl name='face_index' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='961' column='1'/>
+        <var-decl name='face_index' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='961' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- FT_Long FT_FaceRec_::face_flags -->
-        <var-decl name='face_flags' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='963' column='1'/>
+        <var-decl name='face_flags' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='963' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_Long FT_FaceRec_::style_flags -->
-        <var-decl name='style_flags' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='964' column='1'/>
+        <var-decl name='style_flags' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='964' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- FT_Long FT_FaceRec_::num_glyphs -->
-        <var-decl name='num_glyphs' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='966' column='1'/>
+        <var-decl name='num_glyphs' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='966' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- FT_String* FT_FaceRec_::family_name -->
-        <var-decl name='family_name' type-id='type-id-589' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='968' column='1'/>
+        <var-decl name='family_name' type-id='type-id-587' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='968' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FT_String* FT_FaceRec_::style_name -->
-        <var-decl name='style_name' type-id='type-id-589' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='969' column='1'/>
+        <var-decl name='style_name' type-id='type-id-587' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='969' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- FT_Int FT_FaceRec_::num_fixed_sizes -->
-        <var-decl name='num_fixed_sizes' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='971' column='1'/>
+        <var-decl name='num_fixed_sizes' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='971' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- FT_Bitmap_Size* FT_FaceRec_::available_sizes -->
-        <var-decl name='available_sizes' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='972' column='1'/>
+        <var-decl name='available_sizes' type-id='type-id-589' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='972' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- FT_Int FT_FaceRec_::num_charmaps -->
-        <var-decl name='num_charmaps' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='974' column='1'/>
+        <var-decl name='num_charmaps' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- FT_CharMap* FT_FaceRec_::charmaps -->
-        <var-decl name='charmaps' type-id='type-id-592' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='975' column='1'/>
+        <var-decl name='charmaps' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='975' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- FT_Generic FT_FaceRec_::generic -->
-        <var-decl name='generic' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='977' column='1'/>
+        <var-decl name='generic' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='977' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- FT_BBox FT_FaceRec_::bbox -->
-        <var-decl name='bbox' type-id='type-id-594' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='982' column='1'/>
+        <var-decl name='bbox' type-id='type-id-592' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='982' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- FT_UShort FT_FaceRec_::units_per_EM -->
-        <var-decl name='units_per_EM' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='984' column='1'/>
+        <var-decl name='units_per_EM' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='984' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1104'>
         <!-- FT_Short FT_FaceRec_::ascender -->
-        <var-decl name='ascender' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='985' column='1'/>
+        <var-decl name='ascender' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='985' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
         <!-- FT_Short FT_FaceRec_::descender -->
-        <var-decl name='descender' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='986' column='1'/>
+        <var-decl name='descender' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='986' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1136'>
         <!-- FT_Short FT_FaceRec_::height -->
-        <var-decl name='height' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='987' column='1'/>
+        <var-decl name='height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='987' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- FT_Short FT_FaceRec_::max_advance_width -->
-        <var-decl name='max_advance_width' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='989' column='1'/>
+        <var-decl name='max_advance_width' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='989' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1168'>
         <!-- FT_Short FT_FaceRec_::max_advance_height -->
-        <var-decl name='max_advance_height' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='990' column='1'/>
+        <var-decl name='max_advance_height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='990' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
         <!-- FT_Short FT_FaceRec_::underline_position -->
-        <var-decl name='underline_position' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='992' column='1'/>
+        <var-decl name='underline_position' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='992' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1200'>
         <!-- FT_Short FT_FaceRec_::underline_thickness -->
-        <var-decl name='underline_thickness' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='993' column='1'/>
+        <var-decl name='underline_thickness' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='993' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- FT_GlyphSlot FT_FaceRec_::glyph -->
-        <var-decl name='glyph' type-id='type-id-595' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='995' column='1'/>
+        <var-decl name='glyph' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='995' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- FT_Size FT_FaceRec_::size -->
-        <var-decl name='size' type-id='type-id-596' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='996' column='1'/>
+        <var-decl name='size' type-id='type-id-594' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='996' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- FT_CharMap FT_FaceRec_::charmap -->
-        <var-decl name='charmap' type-id='type-id-597' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='997' column='1'/>
+        <var-decl name='charmap' type-id='type-id-595' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='997' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- FT_Driver FT_FaceRec_::driver -->
-        <var-decl name='driver' type-id='type-id-598' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1001' column='1'/>
+        <var-decl name='driver' type-id='type-id-596' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1001' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- FT_Memory FT_FaceRec_::memory -->
-        <var-decl name='memory' type-id='type-id-599' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1002' column='1'/>
+        <var-decl name='memory' type-id='type-id-597' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1002' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- FT_Stream FT_FaceRec_::stream -->
-        <var-decl name='stream' type-id='type-id-600' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1003' column='1'/>
+        <var-decl name='stream' type-id='type-id-598' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1003' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- FT_ListRec FT_FaceRec_::sizes_list -->
-        <var-decl name='sizes_list' type-id='type-id-601' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1005' column='1'/>
+        <var-decl name='sizes_list' type-id='type-id-599' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1005' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
         <!-- FT_Generic FT_FaceRec_::autohint -->
-        <var-decl name='autohint' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1007' column='1'/>
+        <var-decl name='autohint' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1007' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
         <!-- void* FT_FaceRec_::extensions -->
@@ -9926,128 +9913,128 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
         <!-- FT_Face_Internal FT_FaceRec_::internal -->
-        <var-decl name='internal' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1010' column='1'/>
+        <var-decl name='internal' type-id='type-id-600' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1010' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_Size_Metrics_ -->
-    <class-decl name='FT_Size_Metrics_' size-in-bits='448' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1426' column='1' id='type-id-603'>
+    <class-decl name='FT_Size_Metrics_' size-in-bits='448' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1426' column='1' id='type-id-601'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_UShort FT_Size_Metrics_::x_ppem -->
-        <var-decl name='x_ppem' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1427' column='1'/>
+        <var-decl name='x_ppem' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1427' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <!-- FT_UShort FT_Size_Metrics_::y_ppem -->
-        <var-decl name='y_ppem' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1428' column='1'/>
+        <var-decl name='y_ppem' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Fixed FT_Size_Metrics_::x_scale -->
-        <var-decl name='x_scale' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1430' column='1'/>
+        <var-decl name='x_scale' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1430' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- FT_Fixed FT_Size_Metrics_::y_scale -->
-        <var-decl name='y_scale' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1431' column='1'/>
+        <var-decl name='y_scale' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_Pos FT_Size_Metrics_::ascender -->
-        <var-decl name='ascender' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1433' column='1'/>
+        <var-decl name='ascender' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- FT_Pos FT_Size_Metrics_::descender -->
-        <var-decl name='descender' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1434' column='1'/>
+        <var-decl name='descender' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1434' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- FT_Pos FT_Size_Metrics_::height -->
-        <var-decl name='height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1435' column='1'/>
+        <var-decl name='height' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1435' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FT_Pos FT_Size_Metrics_::max_advance -->
-        <var-decl name='max_advance' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1436' column='1'/>
+        <var-decl name='max_advance' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1436' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_SizeRec_ -->
-    <class-decl name='FT_SizeRec_' size-in-bits='704' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1461' column='1' id='type-id-605'>
+    <class-decl name='FT_SizeRec_' size-in-bits='704' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1461' column='1' id='type-id-603'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_Face FT_SizeRec_::face -->
-        <var-decl name='face' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1462' column='1'/>
+        <var-decl name='face' type-id='type-id-582' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Generic FT_SizeRec_::generic -->
-        <var-decl name='generic' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1463' column='1'/>
+        <var-decl name='generic' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1463' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_Size_Metrics FT_SizeRec_::metrics -->
-        <var-decl name='metrics' type-id='type-id-606' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1464' column='1'/>
+        <var-decl name='metrics' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- FT_Size_Internal FT_SizeRec_::internal -->
-        <var-decl name='internal' type-id='type-id-607' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1465' column='1'/>
+        <var-decl name='internal' type-id='type-id-605' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1465' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_GlyphSlotRec_ -->
-    <class-decl name='FT_GlyphSlotRec_' size-in-bits='2432' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1671' column='1' id='type-id-608'>
+    <class-decl name='FT_GlyphSlotRec_' size-in-bits='2432' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1671' column='1' id='type-id-606'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_Library FT_GlyphSlotRec_::library -->
-        <var-decl name='library' type-id='type-id-609' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1672' column='1'/>
+        <var-decl name='library' type-id='type-id-607' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1672' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Face FT_GlyphSlotRec_::face -->
-        <var-decl name='face' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1673' column='1'/>
+        <var-decl name='face' type-id='type-id-582' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1673' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- FT_GlyphSlot FT_GlyphSlotRec_::next -->
-        <var-decl name='next' type-id='type-id-595' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1674' column='1'/>
+        <var-decl name='next' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1674' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_UInt FT_GlyphSlotRec_::reserved -->
-        <var-decl name='reserved' type-id='type-id-610' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1675' column='1'/>
+        <var-decl name='reserved' type-id='type-id-608' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1675' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- FT_Generic FT_GlyphSlotRec_::generic -->
-        <var-decl name='generic' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1676' column='1'/>
+        <var-decl name='generic' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1676' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FT_Glyph_Metrics FT_GlyphSlotRec_::metrics -->
-        <var-decl name='metrics' type-id='type-id-611' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1678' column='1'/>
+        <var-decl name='metrics' type-id='type-id-609' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1678' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- FT_Fixed FT_GlyphSlotRec_::linearHoriAdvance -->
-        <var-decl name='linearHoriAdvance' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1679' column='1'/>
+        <var-decl name='linearHoriAdvance' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1679' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- FT_Fixed FT_GlyphSlotRec_::linearVertAdvance -->
-        <var-decl name='linearVertAdvance' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1680' column='1'/>
+        <var-decl name='linearVertAdvance' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1680' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- FT_Vector FT_GlyphSlotRec_::advance -->
-        <var-decl name='advance' type-id='type-id-612' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1681' column='1'/>
+        <var-decl name='advance' type-id='type-id-610' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1681' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- FT_Glyph_Format FT_GlyphSlotRec_::format -->
-        <var-decl name='format' type-id='type-id-613' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1683' column='1'/>
+        <var-decl name='format' type-id='type-id-611' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1683' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- FT_Bitmap FT_GlyphSlotRec_::bitmap -->
-        <var-decl name='bitmap' type-id='type-id-614' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1685' column='1'/>
+        <var-decl name='bitmap' type-id='type-id-612' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1685' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- FT_Int FT_GlyphSlotRec_::bitmap_left -->
-        <var-decl name='bitmap_left' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1686' column='1'/>
+        <var-decl name='bitmap_left' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1686' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
         <!-- FT_Int FT_GlyphSlotRec_::bitmap_top -->
-        <var-decl name='bitmap_top' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1687' column='1'/>
+        <var-decl name='bitmap_top' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1687' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- FT_Outline FT_GlyphSlotRec_::outline -->
-        <var-decl name='outline' type-id='type-id-615' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1689' column='1'/>
+        <var-decl name='outline' type-id='type-id-613' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1689' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
         <!-- FT_UInt FT_GlyphSlotRec_::num_subglyphs -->
-        <var-decl name='num_subglyphs' type-id='type-id-610' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1691' column='1'/>
+        <var-decl name='num_subglyphs' type-id='type-id-608' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1691' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1984'>
         <!-- FT_SubGlyph FT_GlyphSlotRec_::subglyphs -->
-        <var-decl name='subglyphs' type-id='type-id-616' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1692' column='1'/>
+        <var-decl name='subglyphs' type-id='type-id-614' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1692' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
         <!-- void* FT_GlyphSlotRec_::control_data -->
@@ -10059,11 +10046,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
         <!-- FT_Pos FT_GlyphSlotRec_::lsb_delta -->
-        <var-decl name='lsb_delta' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1697' column='1'/>
+        <var-decl name='lsb_delta' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1697' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- FT_Pos FT_GlyphSlotRec_::rsb_delta -->
-        <var-decl name='rsb_delta' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1698' column='1'/>
+        <var-decl name='rsb_delta' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1698' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <!-- void* FT_GlyphSlotRec_::other -->
@@ -10071,41 +10058,41 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- FT_Slot_Internal FT_GlyphSlotRec_::internal -->
-        <var-decl name='internal' type-id='type-id-617' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1702' column='1'/>
+        <var-decl name='internal' type-id='type-id-615' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1702' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_Vector_ -->
-    <class-decl name='FT_Vector_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='75' column='1' id='type-id-618'>
+    <class-decl name='FT_Vector_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='75' column='1' id='type-id-616'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_Pos FT_Vector_::x -->
-        <var-decl name='x' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='76' column='1'/>
+        <var-decl name='x' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Pos FT_Vector_::y -->
-        <var-decl name='y' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='77' column='1'/>
+        <var-decl name='y' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='77' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_BBox_ -->
-    <class-decl name='FT_BBox_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='116' column='1' id='type-id-619'>
+    <class-decl name='FT_BBox_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='116' column='1' id='type-id-617'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_Pos FT_BBox_::xMin -->
-        <var-decl name='xMin' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='117' column='1'/>
+        <var-decl name='xMin' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Pos FT_BBox_::yMin -->
-        <var-decl name='yMin' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='117' column='1'/>
+        <var-decl name='yMin' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- FT_Pos FT_BBox_::xMax -->
-        <var-decl name='xMax' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='118' column='1'/>
+        <var-decl name='xMax' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_Pos FT_BBox_::yMax -->
-        <var-decl name='yMax' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='118' column='1'/>
+        <var-decl name='yMax' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='118' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_Bitmap_ -->
-    <class-decl name='FT_Bitmap_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='320' column='1' id='type-id-620'>
+    <class-decl name='FT_Bitmap_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='320' column='1' id='type-id-618'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int FT_Bitmap_::rows -->
         <var-decl name='rows' type-id='type-id-9' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='321' column='1'/>
@@ -10120,7 +10107,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* FT_Bitmap_::buffer -->
-        <var-decl name='buffer' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='324' column='1'/>
+        <var-decl name='buffer' type-id='type-id-619' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- short int FT_Bitmap_::num_grays -->
@@ -10140,7 +10127,7 @@
       </data-member>
     </class-decl>
     <!-- struct FT_Outline_ -->
-    <class-decl name='FT_Outline_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='393' column='1' id='type-id-622'>
+    <class-decl name='FT_Outline_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='393' column='1' id='type-id-620'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- short int FT_Outline_::n_contours -->
         <var-decl name='n_contours' type-id='type-id-72' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='394' column='1'/>
@@ -10151,7 +10138,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Vector* FT_Outline_::points -->
-        <var-decl name='points' type-id='type-id-623' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='397' column='1'/>
+        <var-decl name='points' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='397' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- char* FT_Outline_::tags -->
@@ -10159,7 +10146,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- short int* FT_Outline_::contours -->
-        <var-decl name='contours' type-id='type-id-624' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='399' column='1'/>
+        <var-decl name='contours' type-id='type-id-622' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int FT_Outline_::flags -->
@@ -10167,7 +10154,7 @@
       </data-member>
     </class-decl>
     <!-- enum FT_Glyph_Format_ -->
-    <enum-decl name='FT_Glyph_Format_' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='787' column='1' id='type-id-625'>
+    <enum-decl name='FT_Glyph_Format_' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='787' column='1' id='type-id-623'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='FT_GLYPH_FORMAT_NONE' value='0'/>
       <enumerator name='FT_GLYPH_FORMAT_COMPOSITE' value='1668246896'/>
@@ -10176,26 +10163,26 @@
       <enumerator name='FT_GLYPH_FORMAT_PLOTTER' value='1886154612'/>
     </enum-decl>
     <!-- struct FT_MemoryRec_ -->
-    <class-decl name='FT_MemoryRec_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='172' column='1' id='type-id-626'>
+    <class-decl name='FT_MemoryRec_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='172' column='1' id='type-id-624'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void* FT_MemoryRec_::user -->
         <var-decl name='user' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Alloc_Func FT_MemoryRec_::alloc -->
-        <var-decl name='alloc' type-id='type-id-627' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='174' column='1'/>
+        <var-decl name='alloc' type-id='type-id-625' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- FT_Free_Func FT_MemoryRec_::free -->
-        <var-decl name='free' type-id='type-id-628' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='175' column='1'/>
+        <var-decl name='free' type-id='type-id-626' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='175' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_Realloc_Func FT_MemoryRec_::realloc -->
-        <var-decl name='realloc' type-id='type-id-629' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='176' column='1'/>
+        <var-decl name='realloc' type-id='type-id-627' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='176' column='1'/>
       </data-member>
     </class-decl>
     <!-- union FT_StreamDesc_ -->
-    <union-decl name='FT_StreamDesc_' size-in-bits='64' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='210' column='1' id='type-id-630'>
+    <union-decl name='FT_StreamDesc_' size-in-bits='64' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='210' column='1' id='type-id-628'>
       <data-member access='public'>
         <!-- long int FT_StreamDesc_::value -->
         <var-decl name='value' type-id='type-id-10' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='211' column='1'/>
@@ -10206,10 +10193,10 @@
       </data-member>
     </union-decl>
     <!-- struct FT_StreamRec_ -->
-    <class-decl name='FT_StreamRec_' size-in-bits='640' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='322' column='1' id='type-id-631'>
+    <class-decl name='FT_StreamRec_' size-in-bits='640' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='322' column='1' id='type-id-629'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned char* FT_StreamRec_::base -->
-        <var-decl name='base' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='323' column='1'/>
+        <var-decl name='base' type-id='type-id-619' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned long int FT_StreamRec_::size -->
@@ -10221,53 +10208,53 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- FT_StreamDesc FT_StreamRec_::descriptor -->
-        <var-decl name='descriptor' type-id='type-id-632' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='327' column='1'/>
+        <var-decl name='descriptor' type-id='type-id-630' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- FT_StreamDesc FT_StreamRec_::pathname -->
-        <var-decl name='pathname' type-id='type-id-632' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='328' column='1'/>
+        <var-decl name='pathname' type-id='type-id-630' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- FT_Stream_IoFunc FT_StreamRec_::read -->
-        <var-decl name='read' type-id='type-id-633' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='329' column='1'/>
+        <var-decl name='read' type-id='type-id-631' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FT_Stream_CloseFunc FT_StreamRec_::close -->
-        <var-decl name='close' type-id='type-id-634' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='330' column='1'/>
+        <var-decl name='close' type-id='type-id-632' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- FT_Memory FT_StreamRec_::memory -->
-        <var-decl name='memory' type-id='type-id-599' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='332' column='1'/>
+        <var-decl name='memory' type-id='type-id-597' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- unsigned char* FT_StreamRec_::cursor -->
-        <var-decl name='cursor' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='333' column='1'/>
+        <var-decl name='cursor' type-id='type-id-619' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- unsigned char* FT_StreamRec_::limit -->
-        <var-decl name='limit' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='334' column='1'/>
+        <var-decl name='limit' type-id='type-id-619' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='334' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_Generic_ -->
-    <class-decl name='FT_Generic_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='456' column='1' id='type-id-635'>
+    <class-decl name='FT_Generic_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='456' column='1' id='type-id-633'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void* FT_Generic_::data -->
         <var-decl name='data' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='457' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Generic_Finalizer FT_Generic_::finalizer -->
-        <var-decl name='finalizer' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='458' column='1'/>
+        <var-decl name='finalizer' type-id='type-id-634' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='458' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct FT_ListNodeRec_ -->
-    <class-decl name='FT_ListNodeRec_' size-in-bits='192' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='541' column='1' id='type-id-637'>
+    <class-decl name='FT_ListNodeRec_' size-in-bits='192' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='541' column='1' id='type-id-635'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_ListNode FT_ListNodeRec_::prev -->
-        <var-decl name='prev' type-id='type-id-638' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='542' column='1'/>
+        <var-decl name='prev' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='542' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_ListNode FT_ListNodeRec_::next -->
-        <var-decl name='next' type-id='type-id-638' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='543' column='1'/>
+        <var-decl name='next' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='543' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void* FT_ListNodeRec_::data -->
@@ -10275,174 +10262,174 @@
       </data-member>
     </class-decl>
     <!-- struct FT_ListRec_ -->
-    <class-decl name='FT_ListRec_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='564' column='1' id='type-id-639'>
+    <class-decl name='FT_ListRec_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='564' column='1' id='type-id-637'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- FT_ListNode FT_ListRec_::head -->
-        <var-decl name='head' type-id='type-id-638' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='565' column='1'/>
+        <var-decl name='head' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='565' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_ListNode FT_ListRec_::tail -->
-        <var-decl name='tail' type-id='type-id-638' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='566' column='1'/>
+        <var-decl name='tail' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='566' column='1'/>
       </data-member>
     </class-decl>
     <!-- FT_Bitmap_Size* -->
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-591'/>
+    <pointer-type-def type-id='type-id-638' size-in-bits='64' id='type-id-589'/>
     <!-- FT_CharMap* -->
-    <pointer-type-def type-id='type-id-597' size-in-bits='64' id='type-id-592'/>
+    <pointer-type-def type-id='type-id-595' size-in-bits='64' id='type-id-590'/>
     <!-- FT_CharMapRec_* -->
-    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-641'/>
+    <pointer-type-def type-id='type-id-581' size-in-bits='64' id='type-id-639'/>
     <!-- FT_DriverRec_* -->
-    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-643'/>
+    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-641'/>
     <!-- FT_FaceRec_* -->
-    <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-644'/>
+    <pointer-type-def type-id='type-id-585' size-in-bits='64' id='type-id-642'/>
     <!-- FT_Face_InternalRec_* -->
-    <pointer-type-def type-id='type-id-645' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-644'/>
     <!-- FT_GlyphSlotRec_* -->
-    <pointer-type-def type-id='type-id-608' size-in-bits='64' id='type-id-647'/>
+    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-645'/>
     <!-- FT_LibraryRec_* -->
-    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-649'/>
+    <pointer-type-def type-id='type-id-646' size-in-bits='64' id='type-id-647'/>
     <!-- FT_ListNodeRec_* -->
-    <pointer-type-def type-id='type-id-637' size-in-bits='64' id='type-id-650'/>
+    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-648'/>
     <!-- FT_MemoryRec_* -->
-    <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-651'/>
+    <pointer-type-def type-id='type-id-624' size-in-bits='64' id='type-id-649'/>
     <!-- FT_SizeRec_* -->
-    <pointer-type-def type-id='type-id-605' size-in-bits='64' id='type-id-652'/>
+    <pointer-type-def type-id='type-id-603' size-in-bits='64' id='type-id-650'/>
     <!-- FT_Size_InternalRec_* -->
-    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-654'/>
+    <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-652'/>
     <!-- FT_Slot_InternalRec_* -->
-    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-654'/>
     <!-- FT_StreamRec_* -->
-    <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-657'/>
+    <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-655'/>
     <!-- FT_String* -->
-    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-589'/>
+    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-587'/>
     <!-- FT_SubGlyphRec_* -->
-    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-660'/>
+    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-658'/>
     <!-- FT_Vector* -->
-    <pointer-type-def type-id='type-id-612' size-in-bits='64' id='type-id-623'/>
+    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-621'/>
     <!-- short int* -->
-    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-624'/>
+    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-622'/>
     <!-- unsigned char* -->
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-621'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-619'/>
     <!-- unsigned long int (typedef FT_Stream, unsigned long int, unsigned char*, unsigned long int)* -->
-    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-662'/>
+    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-660'/>
     <!-- void (typedef FT_Memory, void*)* -->
-    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-664'/>
+    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-662'/>
     <!-- void (typedef FT_Stream)* -->
-    <pointer-type-def type-id='type-id-665' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-664'/>
     <!-- void* (typedef FT_Memory, long int)* -->
-    <pointer-type-def type-id='type-id-667' size-in-bits='64' id='type-id-668'/>
+    <pointer-type-def type-id='type-id-665' size-in-bits='64' id='type-id-666'/>
     <!-- void* (typedef FT_Memory, long int, long int, void*)* -->
-    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-670'/>
+    <pointer-type-def type-id='type-id-667' size-in-bits='64' id='type-id-668'/>
     <!-- struct FT_DriverRec_ -->
-    <class-decl name='FT_DriverRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-642'/>
+    <class-decl name='FT_DriverRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-640'/>
     <!-- struct FT_Face_InternalRec_ -->
-    <class-decl name='FT_Face_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-645'/>
+    <class-decl name='FT_Face_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-643'/>
     <!-- struct FT_LibraryRec_ -->
-    <class-decl name='FT_LibraryRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-648'/>
+    <class-decl name='FT_LibraryRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-646'/>
     <!-- struct FT_Size_InternalRec_ -->
-    <class-decl name='FT_Size_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-653'/>
+    <class-decl name='FT_Size_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-651'/>
     <!-- struct FT_Slot_InternalRec_ -->
-    <class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-655'/>
+    <class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-653'/>
     <!-- struct FT_SubGlyphRec_ -->
-    <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-659'/>
+    <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-657'/>
     <!-- typedef FT_Glyph_Metrics_ FT_Glyph_Metrics -->
-    <typedef-decl name='FT_Glyph_Metrics' type-id='type-id-578' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='292' column='1' id='type-id-611'/>
+    <typedef-decl name='FT_Glyph_Metrics' type-id='type-id-576' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='292' column='1' id='type-id-609'/>
     <!-- typedef FT_Bitmap_Size_ FT_Bitmap_Size -->
-    <typedef-decl name='FT_Bitmap_Size' type-id='type-id-580' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='343' column='1' id='type-id-640'/>
+    <typedef-decl name='FT_Bitmap_Size' type-id='type-id-578' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='343' column='1' id='type-id-638'/>
     <!-- typedef FT_LibraryRec_* FT_Library -->
-    <typedef-decl name='FT_Library' type-id='type-id-649' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='376' column='1' id='type-id-609'/>
+    <typedef-decl name='FT_Library' type-id='type-id-647' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='376' column='1' id='type-id-607'/>
     <!-- typedef FT_DriverRec_* FT_Driver -->
-    <typedef-decl name='FT_Driver' type-id='type-id-643' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='401' column='1' id='type-id-598'/>
+    <typedef-decl name='FT_Driver' type-id='type-id-641' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='401' column='1' id='type-id-596'/>
     <!-- typedef FT_FaceRec_* FT_Face -->
-    <typedef-decl name='FT_Face' type-id='type-id-644' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='440' column='1' id='type-id-584'/>
+    <typedef-decl name='FT_Face' type-id='type-id-642' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='440' column='1' id='type-id-582'/>
     <!-- typedef FT_SizeRec_* FT_Size -->
-    <typedef-decl name='FT_Size' type-id='type-id-652' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='471' column='1' id='type-id-596'/>
+    <typedef-decl name='FT_Size' type-id='type-id-650' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='471' column='1' id='type-id-594'/>
     <!-- typedef FT_GlyphSlotRec_* FT_GlyphSlot -->
-    <typedef-decl name='FT_GlyphSlot' type-id='type-id-647' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='492' column='1' id='type-id-595'/>
+    <typedef-decl name='FT_GlyphSlot' type-id='type-id-645' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='492' column='1' id='type-id-593'/>
     <!-- typedef FT_CharMapRec_* FT_CharMap -->
-    <typedef-decl name='FT_CharMap' type-id='type-id-641' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='524' column='1' id='type-id-597'/>
+    <typedef-decl name='FT_CharMap' type-id='type-id-639' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='524' column='1' id='type-id-595'/>
     <!-- typedef FT_Encoding_ FT_Encoding -->
-    <typedef-decl name='FT_Encoding' type-id='type-id-582' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='727' column='1' id='type-id-585'/>
+    <typedef-decl name='FT_Encoding' type-id='type-id-580' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='727' column='1' id='type-id-583'/>
     <!-- typedef FT_Face_InternalRec_* FT_Face_Internal -->
-    <typedef-decl name='FT_Face_Internal' type-id='type-id-646' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='810' column='1' id='type-id-602'/>
+    <typedef-decl name='FT_Face_Internal' type-id='type-id-644' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='810' column='1' id='type-id-600'/>
     <!-- typedef FT_Size_InternalRec_* FT_Size_Internal -->
-    <typedef-decl name='FT_Size_Internal' type-id='type-id-654' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1367' column='1' id='type-id-607'/>
+    <typedef-decl name='FT_Size_Internal' type-id='type-id-652' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1367' column='1' id='type-id-605'/>
     <!-- typedef FT_Size_Metrics_ FT_Size_Metrics -->
-    <typedef-decl name='FT_Size_Metrics' type-id='type-id-603' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1438' column='1' id='type-id-606'/>
+    <typedef-decl name='FT_Size_Metrics' type-id='type-id-601' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1438' column='1' id='type-id-604'/>
     <!-- typedef FT_SubGlyphRec_* FT_SubGlyph -->
-    <typedef-decl name='FT_SubGlyph' type-id='type-id-660' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1486' column='1' id='type-id-616'/>
+    <typedef-decl name='FT_SubGlyph' type-id='type-id-658' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1486' column='1' id='type-id-614'/>
     <!-- typedef FT_Slot_InternalRec_* FT_Slot_Internal -->
-    <typedef-decl name='FT_Slot_Internal' type-id='type-id-656' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1498' column='1' id='type-id-617'/>
+    <typedef-decl name='FT_Slot_Internal' type-id='type-id-654' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1498' column='1' id='type-id-615'/>
     <!-- typedef long int FT_Pos -->
-    <typedef-decl name='FT_Pos' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-579'/>
+    <typedef-decl name='FT_Pos' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-577'/>
     <!-- typedef FT_Vector_ FT_Vector -->
-    <typedef-decl name='FT_Vector' type-id='type-id-618' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='79' column='1' id='type-id-612'/>
+    <typedef-decl name='FT_Vector' type-id='type-id-616' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='79' column='1' id='type-id-610'/>
     <!-- typedef FT_BBox_ FT_BBox -->
-    <typedef-decl name='FT_BBox' type-id='type-id-619' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='120' column='1' id='type-id-594'/>
+    <typedef-decl name='FT_BBox' type-id='type-id-617' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='120' column='1' id='type-id-592'/>
     <!-- typedef FT_Bitmap_ FT_Bitmap -->
-    <typedef-decl name='FT_Bitmap' type-id='type-id-620' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='330' column='1' id='type-id-614'/>
+    <typedef-decl name='FT_Bitmap' type-id='type-id-618' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='330' column='1' id='type-id-612'/>
     <!-- typedef FT_Outline_ FT_Outline -->
-    <typedef-decl name='FT_Outline' type-id='type-id-622' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-615'/>
+    <typedef-decl name='FT_Outline' type-id='type-id-620' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-613'/>
     <!-- typedef FT_Glyph_Format_ FT_Glyph_Format -->
-    <typedef-decl name='FT_Glyph_Format' type-id='type-id-625' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='796' column='1' id='type-id-613'/>
+    <typedef-decl name='FT_Glyph_Format' type-id='type-id-623' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='796' column='1' id='type-id-611'/>
     <!-- typedef FT_MemoryRec_* FT_Memory -->
-    <typedef-decl name='FT_Memory' type-id='type-id-651' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='66' column='1' id='type-id-599'/>
+    <typedef-decl name='FT_Memory' type-id='type-id-649' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='66' column='1' id='type-id-597'/>
     <!-- typedef void* (typedef FT_Memory, long int)* FT_Alloc_Func -->
-    <typedef-decl name='FT_Alloc_Func' type-id='type-id-668' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='90' column='1' id='type-id-627'/>
+    <typedef-decl name='FT_Alloc_Func' type-id='type-id-666' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='90' column='1' id='type-id-625'/>
     <!-- typedef void (typedef FT_Memory, void*)* FT_Free_Func -->
-    <typedef-decl name='FT_Free_Func' type-id='type-id-664' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='111' column='1' id='type-id-628'/>
+    <typedef-decl name='FT_Free_Func' type-id='type-id-662' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='111' column='1' id='type-id-626'/>
     <!-- typedef void* (typedef FT_Memory, long int, long int, void*)* FT_Realloc_Func -->
-    <typedef-decl name='FT_Realloc_Func' type-id='type-id-670' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='146' column='1' id='type-id-629'/>
+    <typedef-decl name='FT_Realloc_Func' type-id='type-id-668' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='146' column='1' id='type-id-627'/>
     <!-- typedef FT_StreamRec_* FT_Stream -->
-    <typedef-decl name='FT_Stream' type-id='type-id-657' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='196' column='1' id='type-id-600'/>
+    <typedef-decl name='FT_Stream' type-id='type-id-655' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='196' column='1' id='type-id-598'/>
     <!-- typedef FT_StreamDesc_ FT_StreamDesc -->
-    <typedef-decl name='FT_StreamDesc' type-id='type-id-630' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-632'/>
+    <typedef-decl name='FT_StreamDesc' type-id='type-id-628' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-630'/>
     <!-- typedef unsigned long int (typedef FT_Stream, unsigned long int, unsigned char*, unsigned long int)* FT_Stream_IoFunc -->
-    <typedef-decl name='FT_Stream_IoFunc' type-id='type-id-662' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='251' column='1' id='type-id-633'/>
+    <typedef-decl name='FT_Stream_IoFunc' type-id='type-id-660' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='251' column='1' id='type-id-631'/>
     <!-- typedef void (typedef FT_Stream)* FT_Stream_CloseFunc -->
-    <typedef-decl name='FT_Stream_CloseFunc' type-id='type-id-666' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='268' column='1' id='type-id-634'/>
+    <typedef-decl name='FT_Stream_CloseFunc' type-id='type-id-664' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='268' column='1' id='type-id-632'/>
     <!-- typedef char FT_String -->
-    <typedef-decl name='FT_String' type-id='type-id-2' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='183' column='1' id='type-id-658'/>
+    <typedef-decl name='FT_String' type-id='type-id-2' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='183' column='1' id='type-id-656'/>
     <!-- typedef short int FT_Short -->
-    <typedef-decl name='FT_Short' type-id='type-id-72' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-581'/>
+    <typedef-decl name='FT_Short' type-id='type-id-72' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-579'/>
     <!-- typedef unsigned short int FT_UShort -->
-    <typedef-decl name='FT_UShort' type-id='type-id-81' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='205' column='1' id='type-id-586'/>
+    <typedef-decl name='FT_UShort' type-id='type-id-81' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='205' column='1' id='type-id-584'/>
     <!-- typedef int FT_Int -->
-    <typedef-decl name='FT_Int' type-id='type-id-9' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='216' column='1' id='type-id-590'/>
+    <typedef-decl name='FT_Int' type-id='type-id-9' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='216' column='1' id='type-id-588'/>
     <!-- typedef unsigned int FT_UInt -->
-    <typedef-decl name='FT_UInt' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='227' column='1' id='type-id-610'/>
+    <typedef-decl name='FT_UInt' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='227' column='1' id='type-id-608'/>
     <!-- typedef long int FT_Long -->
-    <typedef-decl name='FT_Long' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='238' column='1' id='type-id-588'/>
+    <typedef-decl name='FT_Long' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='238' column='1' id='type-id-586'/>
     <!-- typedef long int FT_Fixed -->
-    <typedef-decl name='FT_Fixed' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='284' column='1' id='type-id-604'/>
+    <typedef-decl name='FT_Fixed' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='284' column='1' id='type-id-602'/>
     <!-- typedef void (void*)* FT_Generic_Finalizer -->
-    <typedef-decl name='FT_Generic_Finalizer' type-id='type-id-61' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='424' column='1' id='type-id-636'/>
+    <typedef-decl name='FT_Generic_Finalizer' type-id='type-id-61' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='424' column='1' id='type-id-634'/>
     <!-- typedef FT_Generic_ FT_Generic -->
-    <typedef-decl name='FT_Generic' type-id='type-id-635' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='460' column='1' id='type-id-593'/>
+    <typedef-decl name='FT_Generic' type-id='type-id-633' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='460' column='1' id='type-id-591'/>
     <!-- typedef FT_ListNodeRec_* FT_ListNode -->
-    <typedef-decl name='FT_ListNode' type-id='type-id-650' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='511' column='1' id='type-id-638'/>
+    <typedef-decl name='FT_ListNode' type-id='type-id-648' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='511' column='1' id='type-id-636'/>
     <!-- typedef FT_ListRec_ FT_ListRec -->
-    <typedef-decl name='FT_ListRec' type-id='type-id-639' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='568' column='1' id='type-id-601'/>
+    <typedef-decl name='FT_ListRec' type-id='type-id-637' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='568' column='1' id='type-id-599'/>
     <!-- hb_face_t* hb_ft_face_create(FT_Face, hb_destroy_func_t) -->
     <function-decl name='hb_ft_face_create' mangled-name='hb_ft_face_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_face_create'>
       <!-- parameter of type 'typedef FT_Face' -->
-      <parameter type-id='type-id-584' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='333' column='1'/>
+      <parameter type-id='type-id-582' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='333' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='334' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- hb_face_t* hb_ft_face_create_cached(FT_Face) -->
     <function-decl name='hb_ft_face_create_cached' mangled-name='hb_ft_face_create_cached' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_face_create_cached'>
       <!-- parameter of type 'typedef FT_Face' -->
-      <parameter type-id='type-id-584' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1'/>
+      <parameter type-id='type-id-582' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- hb_font_t* hb_ft_font_create(FT_Face, hb_destroy_func_t) -->
     <function-decl name='hb_ft_font_create' mangled-name='hb_ft_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_create'>
       <!-- parameter of type 'typedef FT_Face' -->
-      <parameter type-id='type-id-584' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1'/>
+      <parameter type-id='type-id-582' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='409' column='1'/>
       <!-- hb_font_t* -->
@@ -10460,50 +10447,50 @@
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
       <!-- typedef FT_Face -->
-      <return type-id='type-id-584'/>
+      <return type-id='type-id-582'/>
     </function-decl>
     <!-- unsigned long int (FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
-    <function-type size-in-bits='64' id='type-id-661'>
+    <function-type size-in-bits='64' id='type-id-659'>
       <!-- parameter of type 'typedef FT_Stream' -->
-      <parameter type-id='type-id-600'/>
+      <parameter type-id='type-id-598'/>
       <!-- parameter of type 'unsigned long int' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-621'/>
+      <parameter type-id='type-id-619'/>
       <!-- parameter of type 'unsigned long int' -->
       <parameter type-id='type-id-4'/>
       <!-- unsigned long int -->
       <return type-id='type-id-4'/>
     </function-type>
     <!-- void (FT_Memory, void*) -->
-    <function-type size-in-bits='64' id='type-id-663'>
+    <function-type size-in-bits='64' id='type-id-661'>
       <!-- parameter of type 'typedef FT_Memory' -->
-      <parameter type-id='type-id-599'/>
+      <parameter type-id='type-id-597'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-type>
     <!-- void (FT_Stream) -->
-    <function-type size-in-bits='64' id='type-id-665'>
+    <function-type size-in-bits='64' id='type-id-663'>
       <!-- parameter of type 'typedef FT_Stream' -->
-      <parameter type-id='type-id-600'/>
+      <parameter type-id='type-id-598'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-type>
     <!-- void* (FT_Memory, long int) -->
-    <function-type size-in-bits='64' id='type-id-667'>
+    <function-type size-in-bits='64' id='type-id-665'>
       <!-- parameter of type 'typedef FT_Memory' -->
-      <parameter type-id='type-id-599'/>
+      <parameter type-id='type-id-597'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-10'/>
       <!-- void* -->
       <return type-id='type-id-17'/>
     </function-type>
     <!-- void* (FT_Memory, long int, long int, void*) -->
-    <function-type size-in-bits='64' id='type-id-669'>
+    <function-type size-in-bits='64' id='type-id-667'>
       <!-- parameter of type 'typedef FT_Memory' -->
-      <parameter type-id='type-id-599'/>
+      <parameter type-id='type-id-597'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-10'/>
       <!-- parameter of type 'long int' -->
@@ -10516,7 +10503,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- enum GUnicodeScript -->
-    <enum-decl name='GUnicodeScript' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/glib@2.42.1-46d6a76b/include/glib-2.0/glib/gunicode.h' line='409' column='1' id='type-id-671'>
+    <enum-decl name='GUnicodeScript' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/glib@2.42.1-46d6a76b/include/glib-2.0/glib/gunicode.h' line='409' column='1' id='type-id-669'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='G_UNICODE_SCRIPT_INVALID_CODE' value='-1'/>
       <enumerator name='G_UNICODE_SCRIPT_COMMON' value='0'/>
@@ -10649,7 +10636,7 @@
     <!-- hb_script_t hb_glib_script_to_script(GUnicodeScript) -->
     <function-decl name='hb_glib_script_to_script' mangled-name='hb_glib_script_to_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_script_to_script'>
       <!-- parameter of type 'enum GUnicodeScript' -->
-      <parameter type-id='type-id-671' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1'/>
+      <parameter type-id='type-id-669' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1'/>
       <!-- enum hb_script_t -->
       <return type-id='type-id-106'/>
     </function-decl>
@@ -10658,7 +10645,7 @@
       <!-- parameter of type 'enum hb_script_t' -->
       <parameter type-id='type-id-106' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1'/>
       <!-- enum GUnicodeScript -->
-      <return type-id='type-id-671'/>
+      <return type-id='type-id-669'/>
     </function-decl>
     <!-- hb_unicode_funcs_t* hb_glib_get_unicode_funcs() -->
     <function-decl name='hb_glib_get_unicode_funcs' mangled-name='hb_glib_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_get_unicode_funcs'>
@@ -10668,62 +10655,62 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- BYTE[256] -->
-    <array-type-def dimensions='1' type-id='type-id-672' size-in-bits='2048' id='type-id-673'>
+    <array-type-def dimensions='1' type-id='type-id-670' size-in-bits='2048' id='type-id-671'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-4' id='type-id-674'/>
+      <subrange length='256' type-id='type-id-4' id='type-id-672'/>
     </array-type-def>
     <!-- CmapSubtableLongGroup[1] -->
-    <array-type-def dimensions='1' type-id='type-id-675' id='type-id-676'>
+    <array-type-def dimensions='1' type-id='type-id-673' id='type-id-674'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- EncodingRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-677' id='type-id-678'>
+    <array-type-def dimensions='1' type-id='type-id-675' id='type-id-676'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- IntType<short unsigned int, 2u>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-239' id='type-id-679'>
+    <array-type-def dimensions='1' type-id='type-id-237' id='type-id-677'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- LongMetric[1] -->
-    <array-type-def dimensions='1' type-id='type-id-680' id='type-id-681'>
+    <array-type-def dimensions='1' type-id='type-id-678' id='type-id-679'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- SHORT[1] -->
-    <array-type-def dimensions='1' type-id='type-id-575' id='type-id-682'>
+    <array-type-def dimensions='1' type-id='type-id-573' id='type-id-680'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- USHORT[1] -->
-    <array-type-def dimensions='1' type-id='type-id-373' id='type-id-683'>
+    <array-type-def dimensions='1' type-id='type-id-371' id='type-id-681'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- UVSMapping[1] -->
-    <array-type-def dimensions='1' type-id='type-id-684' id='type-id-685'>
+    <array-type-def dimensions='1' type-id='type-id-682' id='type-id-683'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- UnicodeValueRange[1] -->
-    <array-type-def dimensions='1' type-id='type-id-686' id='type-id-687'>
+    <array-type-def dimensions='1' type-id='type-id-684' id='type-id-685'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- VariationSelectorRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-688' id='type-id-689'>
+    <array-type-def dimensions='1' type-id='type-id-686' id='type-id-687'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- uint8_t[3] -->
-    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='24' id='type-id-690'>
+    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='24' id='type-id-688'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-4' id='type-id-691'/>
+      <subrange length='3' type-id='type-id-4' id='type-id-689'/>
     </array-type-def>
     <!-- struct hb_ot_face_metrics_accelerator_t -->
-    <class-decl name='hb_ot_face_metrics_accelerator_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='39' column='1' id='type-id-692'>
+    <class-decl name='hb_ot_face_metrics_accelerator_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='39' column='1' id='type-id-690'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int hb_ot_face_metrics_accelerator_t::num_metrics -->
         <var-decl name='num_metrics' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='40' column='1'/>
@@ -10738,7 +10725,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const OT::_mtx* hb_ot_face_metrics_accelerator_t::table -->
-        <var-decl name='table' type-id='type-id-693' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='43' column='1'/>
+        <var-decl name='table' type-id='type-id-691' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- hb_blob_t* hb_ot_face_metrics_accelerator_t::blob -->
@@ -10748,7 +10735,7 @@
         <!-- unsigned int hb_ot_face_metrics_accelerator_t::get_advance(hb_codepoint_t) -->
         <function-decl name='get_advance' mangled-name='_ZNK32hb_ot_face_metrics_accelerator_t11get_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_face_metrics_accelerator_t*' -->
-          <parameter type-id='type-id-694' is-artificial='yes'/>
+          <parameter type-id='type-id-692' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- unsigned int -->
@@ -10759,7 +10746,7 @@
         <!-- void hb_ot_face_metrics_accelerator_t::fini() -->
         <function-decl name='fini' mangled-name='_ZN32hb_ot_face_metrics_accelerator_t4finiEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_face_metrics_accelerator_t*' -->
-          <parameter type-id='type-id-695' is-artificial='yes'/>
+          <parameter type-id='type-id-693' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -10768,13 +10755,13 @@
         <!-- void hb_ot_face_metrics_accelerator_t::init(hb_face_t*, hb_tag_t, hb_tag_t, unsigned int) -->
         <function-decl name='init' mangled-name='_ZN32hb_ot_face_metrics_accelerator_t4initEP9hb_face_tjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_face_metrics_accelerator_t*' -->
-          <parameter type-id='type-id-695' is-artificial='yes'/>
+          <parameter type-id='type-id-693' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- void -->
@@ -10783,14 +10770,14 @@
       </member-function>
     </class-decl>
     <!-- struct hb_ot_face_cmap_accelerator_t -->
-    <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-696'>
+    <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-694'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const OT::CmapSubtable* hb_ot_face_cmap_accelerator_t::table -->
-        <var-decl name='table' type-id='type-id-697' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='96' column='1'/>
+        <var-decl name='table' type-id='type-id-695' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const OT::CmapSubtable* hb_ot_face_cmap_accelerator_t::uvs_table -->
-        <var-decl name='uvs_table' type-id='type-id-697' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='97' column='1'/>
+        <var-decl name='uvs_table' type-id='type-id-695' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_blob_t* hb_ot_face_cmap_accelerator_t::blob -->
@@ -10800,7 +10787,7 @@
         <!-- bool hb_ot_face_cmap_accelerator_t::get_glyph(hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <function-decl name='get_glyph' mangled-name='_ZNK29hb_ot_face_cmap_accelerator_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_face_cmap_accelerator_t*' -->
-          <parameter type-id='type-id-698' is-artificial='yes'/>
+          <parameter type-id='type-id-696' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -10815,9 +10802,9 @@
         <!-- void hb_ot_face_cmap_accelerator_t::init(hb_face_t*) -->
         <function-decl name='init' mangled-name='_ZN29hb_ot_face_cmap_accelerator_t4initEP9hb_face_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_face_cmap_accelerator_t*' -->
-          <parameter type-id='type-id-699' is-artificial='yes'/>
+          <parameter type-id='type-id-697' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -10826,288 +10813,288 @@
         <!-- void hb_ot_face_cmap_accelerator_t::fini() -->
         <function-decl name='fini' mangled-name='_ZN29hb_ot_face_cmap_accelerator_t4finiEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_face_cmap_accelerator_t*' -->
-          <parameter type-id='type-id-699' is-artificial='yes'/>
+          <parameter type-id='type-id-697' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-700' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-699'/>
     <!-- OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-703'/>
+    <pointer-type-def type-id='type-id-700' size-in-bits='64' id='type-id-701'/>
     <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-704' size-in-bits='64' id='type-id-560'/>
+    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-558'/>
     <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-705' size-in-bits='64' id='type-id-706'/>
+    <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-704'/>
     <!-- OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-708'/>
+    <pointer-type-def type-id='type-id-705' size-in-bits='64' id='type-id-706'/>
     <!-- OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-710'/>
+    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-708'/>
     <!-- OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-710'/>
     <!-- OT::BEInt<unsigned int, 3>* -->
-    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
     <!-- OT::CmapSubtable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-715' size-in-bits='64' id='type-id-716'/>
+    <reference-type-def kind='lvalue' type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
     <!-- OT::CmapSubtable* -->
-    <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-717'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-715'/>
     <!-- OT::CmapSubtableFormat0* -->
-    <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-717'/>
     <!-- OT::CmapSubtableFormat14* -->
-    <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-719'/>
     <!-- OT::CmapSubtableFormat4* -->
-    <pointer-type-def type-id='type-id-722' size-in-bits='64' id='type-id-723'/>
+    <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-721'/>
     <!-- OT::CmapSubtableLongGroup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-724'/>
+    <reference-type-def kind='lvalue' type-id='type-id-673' size-in-bits='64' id='type-id-722'/>
     <!-- OT::CmapSubtableLongGroup* -->
-    <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-725'/>
+    <pointer-type-def type-id='type-id-673' size-in-bits='64' id='type-id-723'/>
     <!-- OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>* -->
-    <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-727'/>
+    <pointer-type-def type-id='type-id-724' size-in-bits='64' id='type-id-725'/>
     <!-- OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>* -->
-    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
+    <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-727'/>
     <!-- OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-730' size-in-bits='64' id='type-id-731'/>
+    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
     <!-- OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-732' size-in-bits='64' id='type-id-733'/>
+    <pointer-type-def type-id='type-id-730' size-in-bits='64' id='type-id-731'/>
     <!-- OT::EncodingRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-677' size-in-bits='64' id='type-id-734'/>
+    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-732'/>
     <!-- OT::EncodingRecord* -->
-    <pointer-type-def type-id='type-id-677' size-in-bits='64' id='type-id-735'/>
+    <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-733'/>
     <!-- OT::IntType<short unsigned int, 2u>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-239' size-in-bits='64' id='type-id-736'/>
+    <reference-type-def kind='lvalue' type-id='type-id-237' size-in-bits='64' id='type-id-734'/>
     <!-- OT::IntType<unsigned int, 3u>* -->
-    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-738'/>
+    <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-736'/>
     <!-- OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-378'/>
     <!-- OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-738' size-in-bits='64' id='type-id-377'/>
     <!-- OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-741' size-in-bits='64' id='type-id-378'/>
+    <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-376'/>
     <!-- OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-742' size-in-bits='64' id='type-id-743'/>
+    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-741'/>
     <!-- OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-745'/>
+    <reference-type-def kind='lvalue' type-id='type-id-742' size-in-bits='64' id='type-id-743'/>
     <!-- OT::Supplier<OT::CmapSubtableLongGroup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-746' size-in-bits='64' id='type-id-747'/>
+    <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-745'/>
     <!-- OT::Supplier<OT::EncodingRecord>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-748' size-in-bits='64' id='type-id-749'/>
+    <reference-type-def kind='lvalue' type-id='type-id-746' size-in-bits='64' id='type-id-747'/>
     <!-- OT::Supplier<OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-750' size-in-bits='64' id='type-id-751'/>
+    <reference-type-def kind='lvalue' type-id='type-id-748' size-in-bits='64' id='type-id-749'/>
     <!-- OT::Supplier<OT::UVSMapping>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-752' size-in-bits='64' id='type-id-753'/>
+    <reference-type-def kind='lvalue' type-id='type-id-750' size-in-bits='64' id='type-id-751'/>
     <!-- OT::Supplier<OT::UnicodeValueRange>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-754' size-in-bits='64' id='type-id-755'/>
+    <reference-type-def kind='lvalue' type-id='type-id-752' size-in-bits='64' id='type-id-753'/>
     <!-- OT::Supplier<OT::VariationSelectorRecord>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-756' size-in-bits='64' id='type-id-757'/>
+    <reference-type-def kind='lvalue' type-id='type-id-754' size-in-bits='64' id='type-id-755'/>
     <!-- OT::USHORT* -->
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-384'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-382'/>
     <!-- OT::UVSMapping& -->
-    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-758'/>
+    <reference-type-def kind='lvalue' type-id='type-id-682' size-in-bits='64' id='type-id-756'/>
     <!-- OT::UVSMapping* -->
-    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-759'/>
+    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-757'/>
     <!-- OT::UnicodeValueRange& -->
-    <reference-type-def kind='lvalue' type-id='type-id-686' size-in-bits='64' id='type-id-760'/>
+    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-758'/>
     <!-- OT::UnicodeValueRange* -->
-    <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-761'/>
+    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-759'/>
     <!-- OT::VariationSelectorRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-688' size-in-bits='64' id='type-id-762'/>
+    <reference-type-def kind='lvalue' type-id='type-id-686' size-in-bits='64' id='type-id-760'/>
     <!-- OT::VariationSelectorRecord* -->
-    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-763'/>
+    <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-761'/>
     <!-- OT::_hea* -->
-    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-765'/>
+    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-763'/>
     <!-- OT::_mtx* -->
-    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-767'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-765'/>
     <!-- OT::cmap* -->
-    <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-769'/>
+    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-767'/>
     <!-- const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-700' const='yes' id='type-id-770'/>
+    <qualified-type-def type-id='type-id-698' const='yes' id='type-id-768'/>
     <!-- const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-770' size-in-bits='64' id='type-id-390'/>
+    <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-388'/>
     <!-- const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-702' const='yes' id='type-id-771'/>
+    <qualified-type-def type-id='type-id-700' const='yes' id='type-id-769'/>
     <!-- const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-769' size-in-bits='64' id='type-id-379'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-704' const='yes' id='type-id-772'/>
+    <qualified-type-def type-id='type-id-702' const='yes' id='type-id-770'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-386'/>
+    <pointer-type-def type-id='type-id-770' size-in-bits='64' id='type-id-384'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-705' const='yes' id='type-id-773'/>
+    <qualified-type-def type-id='type-id-703' const='yes' id='type-id-771'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-388'/>
+    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-386'/>
     <!-- const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-707' const='yes' id='type-id-774'/>
+    <qualified-type-def type-id='type-id-705' const='yes' id='type-id-772'/>
     <!-- const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-396'/>
+    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-394'/>
     <!-- const OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-709' const='yes' id='type-id-775'/>
+    <qualified-type-def type-id='type-id-707' const='yes' id='type-id-773'/>
     <!-- const OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-392'/>
     <!-- const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-711' const='yes' id='type-id-776'/>
+    <qualified-type-def type-id='type-id-709' const='yes' id='type-id-774'/>
     <!-- const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-776' size-in-bits='64' id='type-id-393'/>
+    <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-391'/>
     <!-- const OT::BEInt<unsigned int, 3> -->
-    <qualified-type-def type-id='type-id-713' const='yes' id='type-id-777'/>
+    <qualified-type-def type-id='type-id-711' const='yes' id='type-id-775'/>
     <!-- const OT::BEInt<unsigned int, 3>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-777' size-in-bits='64' id='type-id-778'/>
+    <reference-type-def kind='lvalue' type-id='type-id-775' size-in-bits='64' id='type-id-776'/>
     <!-- const OT::BEInt<unsigned int, 3>* -->
-    <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-779'/>
+    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-777'/>
     <!-- const OT::CmapSubtable -->
-    <qualified-type-def type-id='type-id-715' const='yes' id='type-id-780'/>
+    <qualified-type-def type-id='type-id-713' const='yes' id='type-id-778'/>
     <!-- const OT::CmapSubtable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-781'/>
+    <reference-type-def kind='lvalue' type-id='type-id-778' size-in-bits='64' id='type-id-779'/>
     <!-- const OT::CmapSubtable* -->
-    <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-697'/>
+    <pointer-type-def type-id='type-id-778' size-in-bits='64' id='type-id-695'/>
     <!-- const OT::CmapSubtableFormat0 -->
-    <qualified-type-def type-id='type-id-718' const='yes' id='type-id-782'/>
+    <qualified-type-def type-id='type-id-716' const='yes' id='type-id-780'/>
     <!-- const OT::CmapSubtableFormat0* -->
-    <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-382'/>
+    <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-380'/>
     <!-- const OT::CmapSubtableFormat14 -->
-    <qualified-type-def type-id='type-id-720' const='yes' id='type-id-783'/>
+    <qualified-type-def type-id='type-id-718' const='yes' id='type-id-781'/>
     <!-- const OT::CmapSubtableFormat14* -->
-    <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-399'/>
+    <pointer-type-def type-id='type-id-781' size-in-bits='64' id='type-id-397'/>
     <!-- const OT::CmapSubtableFormat4 -->
-    <qualified-type-def type-id='type-id-722' const='yes' id='type-id-784'/>
+    <qualified-type-def type-id='type-id-720' const='yes' id='type-id-782'/>
     <!-- const OT::CmapSubtableFormat4* -->
-    <pointer-type-def type-id='type-id-784' size-in-bits='64' id='type-id-383'/>
+    <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-381'/>
     <!-- const OT::CmapSubtableLongGroup -->
-    <qualified-type-def type-id='type-id-675' const='yes' id='type-id-785'/>
+    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-783'/>
     <!-- const OT::CmapSubtableLongGroup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-785' size-in-bits='64' id='type-id-786'/>
+    <reference-type-def kind='lvalue' type-id='type-id-783' size-in-bits='64' id='type-id-784'/>
     <!-- const OT::CmapSubtableLongGroup* -->
-    <pointer-type-def type-id='type-id-785' size-in-bits='64' id='type-id-787'/>
+    <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-785'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
-    <qualified-type-def type-id='type-id-726' const='yes' id='type-id-788'/>
+    <qualified-type-def type-id='type-id-724' const='yes' id='type-id-786'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>* -->
-    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-786' size-in-bits='64' id='type-id-389'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
-    <qualified-type-def type-id='type-id-728' const='yes' id='type-id-789'/>
+    <qualified-type-def type-id='type-id-726' const='yes' id='type-id-787'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>* -->
-    <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-392'/>
+    <pointer-type-def type-id='type-id-787' size-in-bits='64' id='type-id-390'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-730' const='yes' id='type-id-790'/>
+    <qualified-type-def type-id='type-id-728' const='yes' id='type-id-788'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-790' size-in-bits='64' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-385'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-732' const='yes' id='type-id-791'/>
+    <qualified-type-def type-id='type-id-730' const='yes' id='type-id-789'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-389'/>
+    <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-387'/>
     <!-- const OT::EncodingRecord -->
-    <qualified-type-def type-id='type-id-677' const='yes' id='type-id-792'/>
+    <qualified-type-def type-id='type-id-675' const='yes' id='type-id-790'/>
     <!-- const OT::EncodingRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-792' size-in-bits='64' id='type-id-793'/>
+    <reference-type-def kind='lvalue' type-id='type-id-790' size-in-bits='64' id='type-id-791'/>
     <!-- const OT::EncodingRecord* -->
-    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-401'/>
+    <pointer-type-def type-id='type-id-790' size-in-bits='64' id='type-id-399'/>
     <!-- const OT::IntType<unsigned int, 3u> -->
-    <qualified-type-def type-id='type-id-737' const='yes' id='type-id-794'/>
+    <qualified-type-def type-id='type-id-735' const='yes' id='type-id-792'/>
     <!-- const OT::IntType<unsigned int, 3u>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-794' size-in-bits='64' id='type-id-795'/>
+    <reference-type-def kind='lvalue' type-id='type-id-792' size-in-bits='64' id='type-id-793'/>
     <!-- const OT::IntType<unsigned int, 3u>* -->
-    <pointer-type-def type-id='type-id-794' size-in-bits='64' id='type-id-796'/>
+    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-794'/>
     <!-- const OT::LongMetric -->
-    <qualified-type-def type-id='type-id-680' const='yes' id='type-id-797'/>
+    <qualified-type-def type-id='type-id-678' const='yes' id='type-id-795'/>
     <!-- const OT::LongMetric* -->
-    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-798'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-796'/>
     <!-- const OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-739' const='yes' id='type-id-799'/>
+    <qualified-type-def type-id='type-id-737' const='yes' id='type-id-797'/>
     <!-- const OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-400'/>
+    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-398'/>
     <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-740' const='yes' id='type-id-800'/>
+    <qualified-type-def type-id='type-id-738' const='yes' id='type-id-798'/>
     <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-800' size-in-bits='64' id='type-id-397'/>
+    <pointer-type-def type-id='type-id-798' size-in-bits='64' id='type-id-395'/>
     <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-741' const='yes' id='type-id-801'/>
+    <qualified-type-def type-id='type-id-739' const='yes' id='type-id-799'/>
     <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-395'/>
+    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-393'/>
     <!-- const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-802' const='yes' id='type-id-803'/>
+    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-801'/>
     <!-- const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
+    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
     <!-- const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-742' const='yes' id='type-id-805'/>
+    <qualified-type-def type-id='type-id-740' const='yes' id='type-id-803'/>
     <!-- const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-805' size-in-bits='64' id='type-id-806'/>
+    <reference-type-def kind='lvalue' type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
     <!-- const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-805' size-in-bits='64' id='type-id-807'/>
+    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-805'/>
     <!-- const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-744' const='yes' id='type-id-808'/>
+    <qualified-type-def type-id='type-id-742' const='yes' id='type-id-806'/>
     <!-- const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-808' size-in-bits='64' id='type-id-809'/>
+    <reference-type-def kind='lvalue' type-id='type-id-806' size-in-bits='64' id='type-id-807'/>
     <!-- const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-808' size-in-bits='64' id='type-id-810'/>
+    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-808'/>
     <!-- const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-811' const='yes' id='type-id-812'/>
+    <qualified-type-def type-id='type-id-809' const='yes' id='type-id-810'/>
     <!-- const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-813'/>
+    <pointer-type-def type-id='type-id-810' size-in-bits='64' id='type-id-811'/>
     <!-- const OT::UVSMapping -->
-    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-814'/>
+    <qualified-type-def type-id='type-id-682' const='yes' id='type-id-812'/>
     <!-- const OT::UVSMapping& -->
-    <reference-type-def kind='lvalue' type-id='type-id-814' size-in-bits='64' id='type-id-815'/>
+    <reference-type-def kind='lvalue' type-id='type-id-812' size-in-bits='64' id='type-id-813'/>
     <!-- const OT::UVSMapping* -->
-    <pointer-type-def type-id='type-id-814' size-in-bits='64' id='type-id-816'/>
+    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-814'/>
     <!-- const OT::UnicodeValueRange -->
-    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-817'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-815'/>
     <!-- const OT::UnicodeValueRange& -->
-    <reference-type-def kind='lvalue' type-id='type-id-817' size-in-bits='64' id='type-id-818'/>
+    <reference-type-def kind='lvalue' type-id='type-id-815' size-in-bits='64' id='type-id-816'/>
     <!-- const OT::UnicodeValueRange* -->
-    <pointer-type-def type-id='type-id-817' size-in-bits='64' id='type-id-819'/>
+    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-817'/>
     <!-- const OT::VariationSelectorRecord -->
-    <qualified-type-def type-id='type-id-688' const='yes' id='type-id-820'/>
+    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-818'/>
     <!-- const OT::VariationSelectorRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-820' size-in-bits='64' id='type-id-821'/>
+    <reference-type-def kind='lvalue' type-id='type-id-818' size-in-bits='64' id='type-id-819'/>
     <!-- const OT::VariationSelectorRecord* -->
-    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-398'/>
+    <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-396'/>
     <!-- const OT::_hea -->
-    <qualified-type-def type-id='type-id-764' const='yes' id='type-id-822'/>
+    <qualified-type-def type-id='type-id-762' const='yes' id='type-id-820'/>
     <!-- const OT::_hea* -->
-    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-403'/>
+    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-401'/>
     <!-- const OT::_mtx -->
-    <qualified-type-def type-id='type-id-766' const='yes' id='type-id-823'/>
+    <qualified-type-def type-id='type-id-764' const='yes' id='type-id-821'/>
     <!-- const OT::_mtx* -->
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-691'/>
     <!-- const OT::cmap -->
-    <qualified-type-def type-id='type-id-768' const='yes' id='type-id-824'/>
+    <qualified-type-def type-id='type-id-766' const='yes' id='type-id-822'/>
     <!-- const OT::cmap* -->
-    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-402'/>
+    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-400'/>
     <!-- const hb_codepoint_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-130' size-in-bits='64' id='type-id-825'/>
+    <reference-type-def kind='lvalue' type-id='type-id-130' size-in-bits='64' id='type-id-823'/>
     <!-- const hb_ot_face_cmap_accelerator_t -->
-    <qualified-type-def type-id='type-id-696' const='yes' id='type-id-826'/>
+    <qualified-type-def type-id='type-id-694' const='yes' id='type-id-824'/>
     <!-- const hb_ot_face_cmap_accelerator_t* -->
-    <pointer-type-def type-id='type-id-826' size-in-bits='64' id='type-id-698'/>
+    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-696'/>
     <!-- const hb_ot_face_metrics_accelerator_t -->
-    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-827'/>
+    <qualified-type-def type-id='type-id-690' const='yes' id='type-id-825'/>
     <!-- const hb_ot_face_metrics_accelerator_t* -->
-    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-694'/>
+    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-692'/>
     <!-- const uint16_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-176' size-in-bits='64' id='type-id-385'/>
+    <reference-type-def kind='lvalue' type-id='type-id-174' size-in-bits='64' id='type-id-383'/>
     <!-- hb_ot_face_cmap_accelerator_t* -->
-    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-699'/>
+    <pointer-type-def type-id='type-id-694' size-in-bits='64' id='type-id-697'/>
     <!-- hb_ot_face_metrics_accelerator_t* -->
-    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-695'/>
+    <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-693'/>
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::BEInt<short unsigned int, 2> -->
-      <class-decl name='BEInt&lt;short unsigned int, 2&gt;' is-struct='yes' visibility='default' id='type-id-828'/>
+      <class-decl name='BEInt&lt;short unsigned int, 2&gt;' is-struct='yes' visibility='default' id='type-id-826'/>
       <!-- struct OT::BEInt<unsigned int, 4> -->
-      <class-decl name='BEInt&lt;unsigned int, 4&gt;' is-struct='yes' visibility='default' id='type-id-829'/>
+      <class-decl name='BEInt&lt;unsigned int, 4&gt;' is-struct='yes' visibility='default' id='type-id-827'/>
       <!-- struct OT::FixedVersion -->
-      <class-decl name='FixedVersion' is-struct='yes' visibility='default' id='type-id-830'/>
+      <class-decl name='FixedVersion' is-struct='yes' visibility='default' id='type-id-828'/>
       <!-- struct OT::IntType<short int, 2u> -->
-      <class-decl name='IntType&lt;short int, 2u&gt;' is-struct='yes' visibility='default' id='type-id-831'/>
+      <class-decl name='IntType&lt;short int, 2u&gt;' is-struct='yes' visibility='default' id='type-id-829'/>
       <!-- struct OT::IntType<short unsigned int, 2u> -->
-      <class-decl name='IntType&lt;short unsigned int, 2u&gt;' is-struct='yes' visibility='default' id='type-id-832'/>
+      <class-decl name='IntType&lt;short unsigned int, 2u&gt;' is-struct='yes' visibility='default' id='type-id-830'/>
       <!-- struct OT::IntType<unsigned int, 4u> -->
-      <class-decl name='IntType&lt;unsigned int, 4u&gt;' is-struct='yes' visibility='default' id='type-id-833'/>
+      <class-decl name='IntType&lt;unsigned int, 4u&gt;' is-struct='yes' visibility='default' id='type-id-831'/>
       <!-- struct OT::hb_sanitize_context_t -->
-      <class-decl name='hb_sanitize_context_t' is-struct='yes' visibility='default' id='type-id-834'/>
+      <class-decl name='hb_sanitize_context_t' is-struct='yes' visibility='default' id='type-id-832'/>
       <!-- struct OT::hb_serialize_context_t -->
-      <class-decl name='hb_serialize_context_t' is-struct='yes' visibility='default' id='type-id-835'/>
+      <class-decl name='hb_serialize_context_t' is-struct='yes' visibility='default' id='type-id-833'/>
       <!-- struct OT::Sanitizer<OT::_hea> -->
-      <class-decl name='Sanitizer&lt;OT::_hea&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-836'>
+      <class-decl name='Sanitizer&lt;OT::_hea&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-834'>
         <member-function access='public' static='yes'>
           <!-- hb_blob_t* OT::Sanitizer<OT::_hea>::sanitize() -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4_heaEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11123,12 +11110,12 @@
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-57'/>
             <!-- const OT::_hea* -->
-            <return type-id='type-id-403'/>
+            <return type-id='type-id-401'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Sanitizer<OT::_mtx> -->
-      <class-decl name='Sanitizer&lt;OT::_mtx&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-837'>
+      <class-decl name='Sanitizer&lt;OT::_mtx&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-835'>
         <member-function access='public' static='yes'>
           <!-- hb_blob_t* OT::Sanitizer<OT::_mtx>::sanitize() -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4_mtxEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11144,12 +11131,12 @@
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-57'/>
             <!-- const OT::_mtx* -->
-            <return type-id='type-id-693'/>
+            <return type-id='type-id-691'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Sanitizer<OT::cmap> -->
-      <class-decl name='Sanitizer&lt;OT::cmap&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-838'>
+      <class-decl name='Sanitizer&lt;OT::cmap&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-836'>
         <member-function access='public' static='yes'>
           <!-- hb_blob_t* OT::Sanitizer<OT::cmap>::sanitize() -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4cmapEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11165,31 +11152,31 @@
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-57'/>
             <!-- const OT::cmap* -->
-            <return type-id='type-id-402'/>
+            <return type-id='type-id-400'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::BEInt<unsigned int, 3> -->
-      <class-decl name='BEInt&lt;unsigned int, 3&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-713'>
+      <class-decl name='BEInt&lt;unsigned int, 3&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-711'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<unsigned int, 3>::v[3] -->
-          <var-decl name='v' type-id='type-id-690' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
+          <var-decl name='v' type-id='type-id-688' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::BEInt<unsigned int, 3>::operator unsigned int() -->
           <function-decl name='operator unsigned int' mangled-name='_ZNK2OT5BEIntIjLi3EEcvjEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::BEInt<unsigned int, 3>*' -->
-            <parameter type-id='type-id-779' is-artificial='yes'/>
+            <parameter type-id='type-id-777' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::IntType<unsigned int, 3u> -->
-      <class-decl name='IntType&lt;unsigned int, 3u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-737'>
+      <class-decl name='IntType&lt;unsigned int, 3u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-735'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::BEInt<unsigned int, 3> OT::IntType<unsigned int, 3u>::v -->
-          <var-decl name='v' type-id='type-id-713' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-711' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<unsigned int, 3u>::static_size -->
@@ -11203,7 +11190,7 @@
           <!-- int OT::IntType<unsigned int, 3u>::cmp(unsigned int) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeIjLj3EE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<unsigned int, 3u>*' -->
-            <parameter type-id='type-id-796' is-artificial='yes'/>
+            <parameter type-id='type-id-794' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- int -->
@@ -11214,16 +11201,16 @@
           <!-- unsigned int OT::IntType<unsigned int, 3u>::operator unsigned int() -->
           <function-decl name='operator unsigned int' mangled-name='_ZNK2OT7IntTypeIjLj3EEcvjEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IntType<unsigned int, 3u>*' -->
-            <parameter type-id='type-id-796' is-artificial='yes'/>
+            <parameter type-id='type-id-794' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-739'>
+      <class-decl name='OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-737'>
         <!-- struct OT::Offset<OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -11236,9 +11223,9 @@
           <!-- bool OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12CmapSubtableENS_7IntTypeIjLj4EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-380' is-artificial='yes'/>
+            <parameter type-id='type-id-378' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11247,9 +11234,9 @@
           <!-- bool OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12CmapSubtableENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-380' is-artificial='yes'/>
+            <parameter type-id='type-id-378' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -11260,18 +11247,18 @@
           <!-- const OT::CmapSubtable& OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12CmapSubtableENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-400' is-artificial='yes'/>
+            <parameter type-id='type-id-398' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::CmapSubtable& -->
-            <return type-id='type-id-781'/>
+            <return type-id='type-id-779'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-740'>
+      <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-738'>
         <!-- struct OT::Offset<OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -11284,9 +11271,9 @@
           <!-- bool OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_13SortedArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEES4_E6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-379' is-artificial='yes'/>
+            <parameter type-id='type-id-377' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11295,9 +11282,9 @@
           <!-- bool OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_13SortedArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-379' is-artificial='yes'/>
+            <parameter type-id='type-id-377' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -11308,18 +11295,18 @@
           <!-- const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >& OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13SortedArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEES4_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-397' is-artificial='yes'/>
+            <parameter type-id='type-id-395' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >& -->
-            <return type-id='type-id-806'/>
+            <return type-id='type-id-804'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-741'>
+      <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-739'>
         <!-- struct OT::Offset<OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -11332,9 +11319,9 @@
           <!-- bool OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_13SortedArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEEES4_E6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-378' is-artificial='yes'/>
+            <parameter type-id='type-id-376' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11343,9 +11330,9 @@
           <!-- bool OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_13SortedArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-378' is-artificial='yes'/>
+            <parameter type-id='type-id-376' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -11356,23 +11343,23 @@
           <!-- const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >& OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13SortedArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEEES4_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-395' is-artificial='yes'/>
+            <parameter type-id='type-id-393' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >& -->
-            <return type-id='type-id-809'/>
+            <return type-id='type-id-807'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-700'>
+      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-698'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::len -->
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::CmapSubtableLongGroup OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-674' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -11382,9 +11369,9 @@
           <!-- bool OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_21CmapSubtableLongGroupENS_7IntTypeIjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11393,34 +11380,34 @@
           <!-- const OT::CmapSubtableLongGroup& OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_21CmapSubtableLongGroupENS_7IntTypeIjLj4EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-390' is-artificial='yes'/>
+            <parameter type-id='type-id-388' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::CmapSubtableLongGroup& -->
-            <return type-id='type-id-786'/>
+            <return type-id='type-id-784'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_21CmapSubtableLongGroupENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-702'>
+      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-700'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::EncodingRecord OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-678' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -11430,9 +11417,9 @@
           <!-- int OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::lsearch<OT::EncodingRecord>(const OT::EncodingRecord&) -->
           <function-decl name='lsearch&lt;OT::EncodingRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-381' is-artificial='yes'/>
+            <parameter type-id='type-id-379' is-artificial='yes'/>
             <!-- parameter of type 'const OT::EncodingRecord&' -->
-            <parameter type-id='type-id-793'/>
+            <parameter type-id='type-id-791'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -11441,9 +11428,9 @@
           <!-- bool OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_14EncodingRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-703' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11452,9 +11439,9 @@
           <!-- bool OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_14EncodingRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-703' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -11465,23 +11452,23 @@
           <!-- const OT::EncodingRecord& OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_14EncodingRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-381' is-artificial='yes'/>
+            <parameter type-id='type-id-379' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::EncodingRecord& -->
-            <return type-id='type-id-793'/>
+            <return type-id='type-id-791'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-704'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-702'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-677' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -11491,9 +11478,9 @@
           <!-- bool OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-560' is-artificial='yes'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11502,9 +11489,9 @@
           <!-- bool OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_E8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-560' is-artificial='yes'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11513,18 +11500,18 @@
           <!-- const OT::IntType<short unsigned int, 2u>& OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEES2_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-386' is-artificial='yes'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::IntType<short unsigned int, 2u>& -->
-            <return type-id='type-id-294'/>
+            <return type-id='type-id-292'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEES2_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-386' is-artificial='yes'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -11533,33 +11520,33 @@
           <!-- const OT::IntType<short unsigned int, 2u>* OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEES2_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-386' is-artificial='yes'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::IntType<short unsigned int, 2u>* -->
-            <return type-id='type-id-295'/>
+            <return type-id='type-id-293'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::IntType<short unsigned int, 2u>& OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-560' is-artificial='yes'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::IntType<short unsigned int, 2u>& -->
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_E9serializeEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='818' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-560' is-artificial='yes'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -11570,11 +11557,11 @@
           <!-- bool OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_E9serializeEPNS_22hb_serialize_context_tERNS_8SupplierIS2_EEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='828' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-560' is-artificial='yes'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -11583,14 +11570,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-705'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-703'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::len -->
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-677' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -11600,9 +11587,9 @@
           <!-- bool OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEENS1_IjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11611,9 +11598,9 @@
           <!-- bool OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEENS1_IjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11622,23 +11609,23 @@
           <!-- const OT::IntType<short unsigned int, 2u>& OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEENS1_IjLj4EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-388' is-artificial='yes'/>
+            <parameter type-id='type-id-386' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::IntType<short unsigned int, 2u>& -->
-            <return type-id='type-id-294'/>
+            <return type-id='type-id-292'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-707'>
+      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-705'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::len -->
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::UVSMapping OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -11648,9 +11635,9 @@
           <!-- bool OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-708' is-artificial='yes'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11659,9 +11646,9 @@
           <!-- bool OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-708' is-artificial='yes'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11670,23 +11657,23 @@
           <!-- const OT::UVSMapping& OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-396' is-artificial='yes'/>
+            <parameter type-id='type-id-394' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::UVSMapping& -->
-            <return type-id='type-id-815'/>
+            <return type-id='type-id-813'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-709'>
+      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-707'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::len -->
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::UnicodeValueRange OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-687' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -11696,9 +11683,9 @@
           <!-- bool OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-710' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11707,23 +11694,23 @@
           <!-- bool OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-710' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-711'>
+      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-709'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::len -->
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::VariationSelectorRecord OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-689' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-687' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -11733,9 +11720,9 @@
           <!-- bool OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_23VariationSelectorRecordENS_7IntTypeIjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-712' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11744,9 +11731,9 @@
           <!-- bool OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_23VariationSelectorRecordENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-712' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -11757,100 +11744,100 @@
           <!-- const OT::VariationSelectorRecord& OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_23VariationSelectorRecordENS_7IntTypeIjLj4EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-393' is-artificial='yes'/>
+            <parameter type-id='type-id-391' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::VariationSelectorRecord& -->
-            <return type-id='type-id-821'/>
+            <return type-id='type-id-819'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-802'>
+      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-800'>
         <!-- struct OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-700'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-698'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-804' is-artificial='yes'/>
+            <parameter type-id='type-id-802' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-839'>
+      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-837'>
         <!-- struct OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-700'/>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-742'>
+      <class-decl name='SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-740'>
         <!-- struct OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-705'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-807' is-artificial='yes'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-744'>
+      <class-decl name='SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-742'>
         <!-- struct OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-709'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-810' is-artificial='yes'/>
+            <parameter type-id='type-id-808' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-811'>
+      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-809'>
         <!-- struct OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-711'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-709'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-813' is-artificial='yes'/>
+            <parameter type-id='type-id-811' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat0 -->
-      <class-decl name='CmapSubtableFormat0' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-718'>
+      <class-decl name='CmapSubtableFormat0' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-716'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat0::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='60' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::CmapSubtableFormat0::lengthZ -->
-          <var-decl name='lengthZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='61' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='61' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::CmapSubtableFormat0::languageZ -->
-          <var-decl name='languageZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='62' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::BYTE OT::CmapSubtableFormat0::glyphIdArray[256] -->
-          <var-decl name='glyphIdArray' type-id='type-id-673' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-671' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat0::static_size -->
@@ -11864,9 +11851,9 @@
           <!-- bool OT::CmapSubtableFormat0::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT19CmapSubtableFormat08sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CmapSubtableFormat0*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-717' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11875,7 +11862,7 @@
           <!-- bool OT::CmapSubtableFormat0::get_glyph(hb_codepoint_t, hb_codepoint_t*) -->
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableFormat09get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtableFormat0*' -->
-            <parameter type-id='type-id-382' is-artificial='yes'/>
+            <parameter type-id='type-id-380' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
@@ -11886,38 +11873,38 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat4 -->
-      <class-decl name='CmapSubtableFormat4' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-722'>
+      <class-decl name='CmapSubtableFormat4' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-720'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='150' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='150' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::length -->
-          <var-decl name='length' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='151' column='1'/>
+          <var-decl name='length' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='151' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::languageZ -->
-          <var-decl name='languageZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='153' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='153' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::segCountX2 -->
-          <var-decl name='segCountX2' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='154' column='1'/>
+          <var-decl name='segCountX2' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='154' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::searchRangeZ -->
-          <var-decl name='searchRangeZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='155' column='1'/>
+          <var-decl name='searchRangeZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='155' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::entrySelectorZ -->
-          <var-decl name='entrySelectorZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='156' column='1'/>
+          <var-decl name='entrySelectorZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='156' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::rangeShiftZ -->
-          <var-decl name='rangeShiftZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='157' column='1'/>
+          <var-decl name='rangeShiftZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='157' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::values[1] -->
-          <var-decl name='values' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
+          <var-decl name='values' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat4::min_size -->
@@ -11927,9 +11914,9 @@
           <!-- bool OT::CmapSubtableFormat4::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT19CmapSubtableFormat48sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CmapSubtableFormat4*' -->
-            <parameter type-id='type-id-723' is-artificial='yes'/>
+            <parameter type-id='type-id-721' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11938,7 +11925,7 @@
           <!-- bool OT::CmapSubtableFormat4::get_glyph(hb_codepoint_t, hb_codepoint_t*) -->
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableFormat49get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtableFormat4*' -->
-            <parameter type-id='type-id-383' is-artificial='yes'/>
+            <parameter type-id='type-id-381' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
@@ -11949,18 +11936,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableLongGroup -->
-      <class-decl name='CmapSubtableLongGroup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='175' column='1' id='type-id-675'>
+      <class-decl name='CmapSubtableLongGroup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='175' column='1' id='type-id-673'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- OT::ULONG OT::CmapSubtableLongGroup::startCharCode -->
-          <var-decl name='startCharCode' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='192' column='1'/>
+          <var-decl name='startCharCode' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='192' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='32'>
           <!-- OT::ULONG OT::CmapSubtableLongGroup::endCharCode -->
-          <var-decl name='endCharCode' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='193' column='1'/>
+          <var-decl name='endCharCode' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='193' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- OT::ULONG OT::CmapSubtableLongGroup::glyphID -->
-          <var-decl name='glyphID' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='194' column='1'/>
+          <var-decl name='glyphID' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongGroup::static_size -->
@@ -11974,7 +11961,7 @@
           <!-- int OT::CmapSubtableLongGroup::cmp(hb_codepoint_t) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT21CmapSubtableLongGroup3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtableLongGroup*' -->
-            <parameter type-id='type-id-787' is-artificial='yes'/>
+            <parameter type-id='type-id-785' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- int -->
@@ -11983,26 +11970,26 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-730'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-728'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::formatReserved -->
-          <var-decl name='formatReserved' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
+          <var-decl name='formatReserved' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::IntType<short unsigned int, 2u> OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::lengthZ -->
-          <var-decl name='lengthZ' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='220' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='220' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::IntType<short unsigned int, 2u> OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::languageZ -->
-          <var-decl name='languageZ' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='221' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='221' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::IntType<short unsigned int, 2u> OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::startCharCode -->
-          <var-decl name='startCharCode' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
+          <var-decl name='startCharCode' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::glyphIdArray -->
-          <var-decl name='glyphIdArray' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -12012,9 +11999,9 @@
           <!-- bool OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT19CmapSubtableTrimmedINS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-729' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12023,7 +12010,7 @@
           <!-- bool OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::get_glyph(unsigned int, hb_codepoint_t*) -->
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableTrimmedINS_7IntTypeItLj2EEEE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-387' is-artificial='yes'/>
+            <parameter type-id='type-id-385' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
@@ -12034,26 +12021,26 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-732'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-730'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::formatReserved -->
-          <var-decl name='formatReserved' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
+          <var-decl name='formatReserved' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::IntType<unsigned int, 4u> OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::lengthZ -->
-          <var-decl name='lengthZ' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='220' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='220' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::IntType<unsigned int, 4u> OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::languageZ -->
-          <var-decl name='languageZ' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='221' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='221' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::IntType<unsigned int, 4u> OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::startCharCode -->
-          <var-decl name='startCharCode' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
+          <var-decl name='startCharCode' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::glyphIdArray -->
-          <var-decl name='glyphIdArray' type-id='type-id-705' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-703' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::min_size -->
@@ -12063,9 +12050,9 @@
           <!-- bool OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT19CmapSubtableTrimmedINS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-733' is-artificial='yes'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12074,7 +12061,7 @@
           <!-- bool OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::get_glyph(unsigned int, hb_codepoint_t*) -->
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableTrimmedINS_7IntTypeIjLj4EEEE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-389' is-artificial='yes'/>
+            <parameter type-id='type-id-387' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
@@ -12085,36 +12072,36 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat6 -->
-      <class-decl name='CmapSubtableFormat6' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='230' column='1' id='type-id-840'>
+      <class-decl name='CmapSubtableFormat6' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='230' column='1' id='type-id-838'>
         <!-- struct OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-730'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-728'/>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat10 -->
-      <class-decl name='CmapSubtableFormat10' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='231' column='1' id='type-id-841'>
+      <class-decl name='CmapSubtableFormat10' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='231' column='1' id='type-id-839'>
         <!-- struct OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-732'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-730'/>
       </class-decl>
       <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-726'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-724'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::reservedZ -->
-          <var-decl name='reservedZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='252' column='1'/>
+          <var-decl name='reservedZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='252' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ULONG OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::lengthZ -->
-          <var-decl name='lengthZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='253' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='253' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ULONG OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::languageZ -->
-          <var-decl name='languageZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::groups -->
-          <var-decl name='groups' type-id='type-id-802' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::min_size -->
@@ -12124,9 +12111,9 @@
           <!-- bool OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat12EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>*' -->
-            <parameter type-id='type-id-727' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12135,7 +12122,7 @@
           <!-- bool OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::get_glyph(unsigned int, hb_codepoint_t*) -->
           <function-decl name='get_glyph' mangled-name='_ZNK2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat12EE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>*' -->
-            <parameter type-id='type-id-391' is-artificial='yes'/>
+            <parameter type-id='type-id-389' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
@@ -12146,26 +12133,26 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-728'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-726'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::reservedZ -->
-          <var-decl name='reservedZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='252' column='1'/>
+          <var-decl name='reservedZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='252' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ULONG OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::lengthZ -->
-          <var-decl name='lengthZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='253' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='253' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ULONG OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::languageZ -->
-          <var-decl name='languageZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::groups -->
-          <var-decl name='groups' type-id='type-id-802' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::min_size -->
@@ -12175,9 +12162,9 @@
           <!-- bool OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat13EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>*' -->
-            <parameter type-id='type-id-729' is-artificial='yes'/>
+            <parameter type-id='type-id-727' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12186,7 +12173,7 @@
           <!-- bool OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::get_glyph(unsigned int, hb_codepoint_t*) -->
           <function-decl name='get_glyph' mangled-name='_ZNK2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat13EE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>*' -->
-            <parameter type-id='type-id-392' is-artificial='yes'/>
+            <parameter type-id='type-id-390' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
@@ -12197,14 +12184,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat12 -->
-      <class-decl name='CmapSubtableFormat12' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='262' column='1' id='type-id-842'>
+      <class-decl name='CmapSubtableFormat12' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='262' column='1' id='type-id-840'>
         <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-726'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-724'/>
         <member-function access='public' static='yes'>
           <!-- hb_codepoint_t OT::CmapSubtableFormat12::group_get_glyph(hb_codepoint_t) -->
           <function-decl name='group_get_glyph' mangled-name='_ZN2OT20CmapSubtableFormat1215group_get_glyphERKNS_21CmapSubtableLongGroupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const OT::CmapSubtableLongGroup&' -->
-            <parameter type-id='type-id-786'/>
+            <parameter type-id='type-id-784'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- typedef hb_codepoint_t -->
@@ -12213,14 +12200,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat13 -->
-      <class-decl name='CmapSubtableFormat13' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='269' column='1' id='type-id-843'>
+      <class-decl name='CmapSubtableFormat13' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='269' column='1' id='type-id-841'>
         <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-728'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-726'/>
         <member-function access='public' static='yes'>
           <!-- hb_codepoint_t OT::CmapSubtableFormat13::group_get_glyph(hb_codepoint_t) -->
           <function-decl name='group_get_glyph' mangled-name='_ZN2OT20CmapSubtableFormat1315group_get_glyphERKNS_21CmapSubtableLongGroupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const OT::CmapSubtableLongGroup&' -->
-            <parameter type-id='type-id-786'/>
+            <parameter type-id='type-id-784'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- typedef hb_codepoint_t -->
@@ -12229,21 +12216,21 @@
         </member-function>
       </class-decl>
       <!-- enum OT::glyph_variant_t -->
-      <enum-decl name='glyph_variant_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='275' column='1' id='type-id-844'>
+      <enum-decl name='glyph_variant_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='275' column='1' id='type-id-842'>
         <underlying-type type-id='type-id-11'/>
         <enumerator name='GLYPH_VARIANT_NOT_FOUND' value='0'/>
         <enumerator name='GLYPH_VARIANT_FOUND' value='1'/>
         <enumerator name='GLYPH_VARIANT_USE_DEFAULT' value='2'/>
       </enum-decl>
       <!-- struct OT::UnicodeValueRange -->
-      <class-decl name='UnicodeValueRange' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='283' column='1' id='type-id-686'>
+      <class-decl name='UnicodeValueRange' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='283' column='1' id='type-id-684'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::UnicodeValueRange::startUnicodeValue -->
-          <var-decl name='startUnicodeValue' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
+          <var-decl name='startUnicodeValue' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::BYTE OT::UnicodeValueRange::additionalCount -->
-          <var-decl name='additionalCount' type-id='type-id-672' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='297' column='1'/>
+          <var-decl name='additionalCount' type-id='type-id-670' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='297' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::UnicodeValueRange::static_size -->
@@ -12257,23 +12244,23 @@
           <!-- int OT::UnicodeValueRange::cmp(const hb_codepoint_t&) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT17UnicodeValueRange3cmpERKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::UnicodeValueRange*' -->
-            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-817' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::UVSMapping -->
-      <class-decl name='UVSMapping' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='306' column='1' id='type-id-684'>
+      <class-decl name='UVSMapping' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='306' column='1' id='type-id-682'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::UVSMapping::unicodeValue -->
-          <var-decl name='unicodeValue' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
+          <var-decl name='unicodeValue' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::GlyphID OT::UVSMapping::glyphID -->
-          <var-decl name='glyphID' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
+          <var-decl name='glyphID' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::UVSMapping::static_size -->
@@ -12287,27 +12274,27 @@
           <!-- int OT::UVSMapping::cmp(const hb_codepoint_t&) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT10UVSMapping3cmpERKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='307' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::UVSMapping*' -->
-            <parameter type-id='type-id-816' is-artificial='yes'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::VariationSelectorRecord -->
-      <class-decl name='VariationSelectorRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-688'>
+      <class-decl name='VariationSelectorRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-686'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::VariationSelectorRecord::varSelector -->
-          <var-decl name='varSelector' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
+          <var-decl name='varSelector' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > OT::VariationSelectorRecord::defaultUVS -->
-          <var-decl name='defaultUVS' type-id='type-id-741' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='360' column='1'/>
+          <var-decl name='defaultUVS' type-id='type-id-739' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='360' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='56'>
           <!-- OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > OT::VariationSelectorRecord::nonDefaultUVS -->
-          <var-decl name='nonDefaultUVS' type-id='type-id-740' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='362' column='1'/>
+          <var-decl name='nonDefaultUVS' type-id='type-id-738' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='362' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::VariationSelectorRecord::static_size -->
@@ -12321,9 +12308,9 @@
           <!-- int OT::VariationSelectorRecord::cmp(const hb_codepoint_t&) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT23VariationSelectorRecord3cmpERKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::VariationSelectorRecord*' -->
-            <parameter type-id='type-id-398' is-artificial='yes'/>
+            <parameter type-id='type-id-396' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -12332,9 +12319,9 @@
           <!-- bool OT::VariationSelectorRecord::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT23VariationSelectorRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::VariationSelectorRecord*' -->
-            <parameter type-id='type-id-763' is-artificial='yes'/>
+            <parameter type-id='type-id-761' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -12345,7 +12332,7 @@
           <!-- OT::glyph_variant_t OT::VariationSelectorRecord::get_glyph(hb_codepoint_t, hb_codepoint_t*, void*) -->
           <function-decl name='get_glyph' mangled-name='_ZNK2OT23VariationSelectorRecord9get_glyphEjPjPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::VariationSelectorRecord*' -->
-            <parameter type-id='type-id-398' is-artificial='yes'/>
+            <parameter type-id='type-id-396' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
@@ -12353,23 +12340,23 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- enum OT::glyph_variant_t -->
-            <return type-id='type-id-844'/>
+            <return type-id='type-id-842'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat14 -->
-      <class-decl name='CmapSubtableFormat14' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-720'>
+      <class-decl name='CmapSubtableFormat14' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-718'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat14::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='383' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='383' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::ULONG OT::CmapSubtableFormat14::lengthZ -->
-          <var-decl name='lengthZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='384' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='384' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > OT::CmapSubtableFormat14::record -->
-          <var-decl name='record' type-id='type-id-811' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
+          <var-decl name='record' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat14::min_size -->
@@ -12379,9 +12366,9 @@
           <!-- bool OT::CmapSubtableFormat14::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT20CmapSubtableFormat148sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CmapSubtableFormat14*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12390,7 +12377,7 @@
           <!-- OT::glyph_variant_t OT::CmapSubtableFormat14::get_glyph_variant(hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
           <function-decl name='get_glyph_variant' mangled-name='_ZNK2OT20CmapSubtableFormat1417get_glyph_variantEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='369' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtableFormat14*' -->
-            <parameter type-id='type-id-399' is-artificial='yes'/>
+            <parameter type-id='type-id-397' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -12398,52 +12385,52 @@
             <!-- parameter of type 'hb_codepoint_t*' -->
             <parameter type-id='type-id-127'/>
             <!-- enum OT::glyph_variant_t -->
-            <return type-id='type-id-844'/>
+            <return type-id='type-id-842'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::CmapSubtable -->
-      <class-decl name='CmapSubtable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='393' column='1' id='type-id-715'>
+      <class-decl name='CmapSubtable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='393' column='1' id='type-id-713'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::CmapSubtableFormat0 format0; OT::CmapSubtableFormat4 format4; OT::CmapSubtableFormat6 format6; OT::CmapSubtableFormat10 format10; OT::CmapSubtableFormat12 format12; OT::CmapSubtableFormat13 format13; OT::CmapSubtableFormat14 format14;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='2096' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='437' column='1' id='type-id-847'>
+          <union-decl name='__anonymous_union__' size-in-bits='2096' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='437' column='1' id='type-id-845'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='438' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='438' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CmapSubtableFormat0 format0 -->
-              <var-decl name='format0' type-id='type-id-718' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
+              <var-decl name='format0' type-id='type-id-716' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CmapSubtableFormat4 format4 -->
-              <var-decl name='format4' type-id='type-id-722' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
+              <var-decl name='format4' type-id='type-id-720' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CmapSubtableFormat6 format6 -->
-              <var-decl name='format6' type-id='type-id-840' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='441' column='1'/>
+              <var-decl name='format6' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='441' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CmapSubtableFormat10 format10 -->
-              <var-decl name='format10' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='442' column='1'/>
+              <var-decl name='format10' type-id='type-id-839' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='442' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CmapSubtableFormat12 format12 -->
-              <var-decl name='format12' type-id='type-id-842' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='443' column='1'/>
+              <var-decl name='format12' type-id='type-id-840' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='443' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CmapSubtableFormat13 format13 -->
-              <var-decl name='format13' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='444' column='1'/>
+              <var-decl name='format13' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='444' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CmapSubtableFormat14 format14 -->
-              <var-decl name='format14' type-id='type-id-720' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
+              <var-decl name='format14' type-id='type-id-718' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::CmapSubtableFormat0 format0; OT::CmapSubtableFormat4 format4; OT::CmapSubtableFormat6 format6; OT::CmapSubtableFormat10 format10; OT::CmapSubtableFormat12 format12; OT::CmapSubtableFormat13 format13; OT::CmapSubtableFormat14 format14;} OT::CmapSubtable::u -->
-          <var-decl name='u' type-id='type-id-847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='446' column='1'/>
+          <var-decl name='u' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='446' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtable::min_size -->
@@ -12453,7 +12440,7 @@
           <!-- OT::glyph_variant_t OT::CmapSubtable::get_glyph_variant(hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
           <function-decl name='get_glyph_variant' mangled-name='_ZNK2OT12CmapSubtable17get_glyph_variantEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtable*' -->
-            <parameter type-id='type-id-697' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -12461,14 +12448,14 @@
             <!-- parameter of type 'hb_codepoint_t*' -->
             <parameter type-id='type-id-127'/>
             <!-- enum OT::glyph_variant_t -->
-            <return type-id='type-id-844'/>
+            <return type-id='type-id-842'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::CmapSubtable::get_glyph(hb_codepoint_t, hb_codepoint_t*) -->
           <function-decl name='get_glyph' mangled-name='_ZNK2OT12CmapSubtable9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='396' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CmapSubtable*' -->
-            <parameter type-id='type-id-697' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
@@ -12481,27 +12468,27 @@
           <!-- bool OT::CmapSubtable::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12CmapSubtable8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CmapSubtable*' -->
-            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::EncodingRecord -->
-      <class-decl name='EncodingRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-677'>
+      <class-decl name='EncodingRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-675'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::EncodingRecord::platformID -->
-          <var-decl name='platformID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='470' column='1'/>
+          <var-decl name='platformID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='470' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::EncodingRecord::encodingID -->
-          <var-decl name='encodingID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='471' column='1'/>
+          <var-decl name='encodingID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='471' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> > OT::EncodingRecord::subtable -->
-          <var-decl name='subtable' type-id='type-id-739' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='473' column='1'/>
+          <var-decl name='subtable' type-id='type-id-737' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='473' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::EncodingRecord::static_size -->
@@ -12515,9 +12502,9 @@
           <!-- int OT::EncodingRecord::cmp(const OT::EncodingRecord&) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT14EncodingRecord3cmpERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::EncodingRecord*' -->
-            <parameter type-id='type-id-401' is-artificial='yes'/>
+            <parameter type-id='type-id-399' is-artificial='yes'/>
             <!-- parameter of type 'const OT::EncodingRecord&' -->
-            <parameter type-id='type-id-793'/>
+            <parameter type-id='type-id-791'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -12526,9 +12513,9 @@
           <!-- bool OT::EncodingRecord::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT14EncodingRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='464' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::EncodingRecord*' -->
-            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -12537,18 +12524,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::cmap -->
-      <class-decl name='cmap' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-768'>
+      <class-decl name='cmap' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-766'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::cmap::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='480' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='480' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::cmap::version -->
-          <var-decl name='version' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='506' column='1'/>
+          <var-decl name='version' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='506' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > OT::cmap::encodingRecord -->
-          <var-decl name='encodingRecord' type-id='type-id-839' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
+          <var-decl name='encodingRecord' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::cmap::min_size -->
@@ -12558,108 +12545,108 @@
           <!-- const OT::CmapSubtable* OT::cmap::find_subtable(unsigned int, unsigned int) -->
           <function-decl name='find_subtable' mangled-name='_ZNK2OT4cmap13find_subtableEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::cmap*' -->
-            <parameter type-id='type-id-402' is-artificial='yes'/>
+            <parameter type-id='type-id-400' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::CmapSubtable* -->
-            <return type-id='type-id-697'/>
+            <return type-id='type-id-695'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::cmap::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4cmap8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::cmap*' -->
-            <parameter type-id='type-id-769' is-artificial='yes'/>
+            <parameter type-id='type-id-767' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::_hea -->
-      <class-decl name='_hea' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-764'>
+      <class-decl name='_hea' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-762'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::_hea::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='47' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='47' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::_hea::hheaTag -->
-          <var-decl name='hheaTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='49' column='1'/>
+          <var-decl name='hheaTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='49' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::_hea::vheaTag -->
-          <var-decl name='vheaTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='50' column='1'/>
+          <var-decl name='vheaTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='50' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::FixedVersion OT::_hea::version -->
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='58' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='58' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::FWORD OT::_hea::ascender -->
-          <var-decl name='ascender' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
+          <var-decl name='ascender' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
           <!-- OT::FWORD OT::_hea::descender -->
-          <var-decl name='descender' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
+          <var-decl name='descender' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::FWORD OT::_hea::lineGap -->
-          <var-decl name='lineGap' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
+          <var-decl name='lineGap' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='80'>
           <!-- OT::UFWORD OT::_hea::advanceMax -->
-          <var-decl name='advanceMax' type-id='type-id-849' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
+          <var-decl name='advanceMax' type-id='type-id-847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
           <!-- OT::FWORD OT::_hea::minLeadingBearing -->
-          <var-decl name='minLeadingBearing' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
+          <var-decl name='minLeadingBearing' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='112'>
           <!-- OT::FWORD OT::_hea::minTrailingBearing -->
-          <var-decl name='minTrailingBearing' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
+          <var-decl name='minTrailingBearing' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- OT::FWORD OT::_hea::maxExtent -->
-          <var-decl name='maxExtent' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
+          <var-decl name='maxExtent' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='144'>
           <!-- OT::SHORT OT::_hea::caretSlopeRise -->
-          <var-decl name='caretSlopeRise' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='71' column='1'/>
+          <var-decl name='caretSlopeRise' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='71' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
           <!-- OT::SHORT OT::_hea::caretSlopeRun -->
-          <var-decl name='caretSlopeRun' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='74' column='1'/>
+          <var-decl name='caretSlopeRun' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='176'>
           <!-- OT::SHORT OT::_hea::caretOffset -->
-          <var-decl name='caretOffset' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='75' column='1'/>
+          <var-decl name='caretOffset' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='75' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- OT::SHORT OT::_hea::reserved1 -->
-          <var-decl name='reserved1' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='80' column='1'/>
+          <var-decl name='reserved1' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='80' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='208'>
           <!-- OT::SHORT OT::_hea::reserved2 -->
-          <var-decl name='reserved2' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='81' column='1'/>
+          <var-decl name='reserved2' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='81' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='224'>
           <!-- OT::SHORT OT::_hea::reserved3 -->
-          <var-decl name='reserved3' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='82' column='1'/>
+          <var-decl name='reserved3' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='82' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='240'>
           <!-- OT::SHORT OT::_hea::reserved4 -->
-          <var-decl name='reserved4' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='83' column='1'/>
+          <var-decl name='reserved4' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='83' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- OT::SHORT OT::_hea::metricDataFormat -->
-          <var-decl name='metricDataFormat' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='84' column='1'/>
+          <var-decl name='metricDataFormat' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='84' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='272'>
           <!-- OT::USHORT OT::_hea::numberOfLongMetrics -->
-          <var-decl name='numberOfLongMetrics' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='85' column='1'/>
+          <var-decl name='numberOfLongMetrics' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='85' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::_hea::static_size -->
@@ -12673,23 +12660,23 @@
           <!-- bool OT::_hea::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4_hea8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::_hea*' -->
-            <parameter type-id='type-id-765' is-artificial='yes'/>
+            <parameter type-id='type-id-763' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::LongMetric -->
-      <class-decl name='LongMetric' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='46' column='1' id='type-id-680'>
+      <class-decl name='LongMetric' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='46' column='1' id='type-id-678'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::LongMetric::advance -->
-          <var-decl name='advance' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='47' column='1'/>
+          <var-decl name='advance' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='47' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::SHORT OT::LongMetric::lsb -->
-          <var-decl name='lsb' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='48' column='1'/>
+          <var-decl name='lsb' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='48' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LongMetric::static_size -->
@@ -12701,26 +12688,26 @@
         </data-member>
       </class-decl>
       <!-- struct OT::_mtx -->
-      <class-decl name='_mtx' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='54' column='1' id='type-id-766'>
+      <class-decl name='_mtx' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='54' column='1' id='type-id-764'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::_mtx::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='55' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='55' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::_mtx::hmtxTag -->
-          <var-decl name='hmtxTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='57' column='1'/>
+          <var-decl name='hmtxTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='57' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::_mtx::vmtxTag -->
-          <var-decl name='vmtxTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='58' column='1'/>
+          <var-decl name='vmtxTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='58' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::LongMetric OT::_mtx::longMetric[1] -->
-          <var-decl name='longMetric' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='68' column='1'/>
+          <var-decl name='longMetric' type-id='type-id-679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='68' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::SHORT OT::_mtx::leadingBearingX[1] -->
-          <var-decl name='leadingBearingX' type-id='type-id-682' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='76' column='1'/>
+          <var-decl name='leadingBearingX' type-id='type-id-680' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::_mtx::min_size -->
@@ -12730,35 +12717,35 @@
           <!-- bool OT::_mtx::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4_mtx8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::_mtx*' -->
-            <parameter type-id='type-id-767' is-artificial='yes'/>
+            <parameter type-id='type-id-765' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Supplier<OT::CmapSubtableLongGroup> -->
-      <class-decl name='Supplier&lt;OT::CmapSubtableLongGroup&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-746'/>
+      <class-decl name='Supplier&lt;OT::CmapSubtableLongGroup&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-744'/>
       <!-- struct OT::Supplier<OT::EncodingRecord> -->
-      <class-decl name='Supplier&lt;OT::EncodingRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-748'/>
+      <class-decl name='Supplier&lt;OT::EncodingRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-746'/>
       <!-- struct OT::Supplier<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='Supplier&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-750'>
+      <class-decl name='Supplier&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-748'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- unsigned int OT::Supplier<OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='511' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- const OT::IntType<short unsigned int, 2u>* OT::Supplier<OT::IntType<short unsigned int, 2u> >::head -->
-          <var-decl name='head' type-id='type-id-295' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
+          <var-decl name='head' type-id='type-id-293' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::Supplier<OT::IntType<short unsigned int, 2u> >::Supplier(const OT::IntType<short unsigned int, 2u>*, unsigned int) -->
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-850' is-artificial='yes'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
             <!-- parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-293'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -12769,9 +12756,9 @@
           <!-- void OT::Supplier<OT::IntType<short unsigned int, 2u> >::Supplier(const OT::Supplier<OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-850' is-artificial='yes'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-851'/>
+            <parameter type-id='type-id-849'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -12780,18 +12767,18 @@
           <!-- const OT::IntType<short unsigned int, 2u> OT::Supplier<OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierINS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Supplier<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-852' is-artificial='yes'/>
+            <parameter type-id='type-id-850' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::IntType<short unsigned int, 2u> -->
-            <return type-id='type-id-293'/>
+            <return type-id='type-id-291'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::Supplier<OT::IntType<short unsigned int, 2u> >::advance(unsigned int) -->
           <function-decl name='advance' mangled-name='_ZN2OT8SupplierINS_7IntTypeItLj2EEEE7advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-850' is-artificial='yes'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -12800,21 +12787,21 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Supplier<OT::UVSMapping> -->
-      <class-decl name='Supplier&lt;OT::UVSMapping&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-752'/>
+      <class-decl name='Supplier&lt;OT::UVSMapping&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-750'/>
       <!-- struct OT::Supplier<OT::UnicodeValueRange> -->
-      <class-decl name='Supplier&lt;OT::UnicodeValueRange&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-754'/>
+      <class-decl name='Supplier&lt;OT::UnicodeValueRange&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-752'/>
       <!-- struct OT::Supplier<OT::VariationSelectorRecord> -->
-      <class-decl name='Supplier&lt;OT::VariationSelectorRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-756'/>
+      <class-decl name='Supplier&lt;OT::VariationSelectorRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-754'/>
       <!-- typedef uint8_t OT::BYTE -->
-      <typedef-decl name='BYTE' type-id='type-id-76' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='631' column='1' id='type-id-672'/>
+      <typedef-decl name='BYTE' type-id='type-id-76' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='631' column='1' id='type-id-670'/>
       <!-- typedef OT::IntType<unsigned int, 3u> OT::UINT24 -->
-      <typedef-decl name='UINT24' type-id='type-id-737' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-845'/>
+      <typedef-decl name='UINT24' type-id='type-id-735' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-843'/>
       <!-- typedef OT::SHORT OT::FWORD -->
-      <typedef-decl name='FWORD' type-id='type-id-575' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-848'/>
+      <typedef-decl name='FWORD' type-id='type-id-573' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-846'/>
       <!-- typedef OT::USHORT OT::UFWORD -->
-      <typedef-decl name='UFWORD' type-id='type-id-373' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-849'/>
+      <typedef-decl name='UFWORD' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-847'/>
       <!-- typedef OT::USHORT OT::GlyphID -->
-      <typedef-decl name='GlyphID' type-id='type-id-373' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-846'/>
+      <typedef-decl name='GlyphID' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-844'/>
     </namespace-decl>
     <!-- void hb_ot_font_set_funcs(hb_font_t*) -->
     <function-decl name='hb_ot_font_set_funcs' mangled-name='hb_ot_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_font_set_funcs'>
@@ -12826,218 +12813,218 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- EntryExitRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-853' id='type-id-854'>
+    <array-type-def dimensions='1' type-id='type-id-851' id='type-id-852'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- Index[1] -->
-    <array-type-def dimensions='1' type-id='type-id-855' id='type-id-856'>
+    <array-type-def dimensions='1' type-id='type-id-853' id='type-id-854'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- IntType<unsigned int, 3u>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-737' id='type-id-857'>
+    <array-type-def dimensions='1' type-id='type-id-735' id='type-id-855'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- LookupRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-858' id='type-id-859'>
+    <array-type-def dimensions='1' type-id='type-id-856' id='type-id-857'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- MarkRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-860' id='type-id-861'>
+    <array-type-def dimensions='1' type-id='type-id-858' id='type-id-859'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- Offset<OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-862' id='type-id-863'>
+    <array-type-def dimensions='1' type-id='type-id-860' id='type-id-861'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-864' id='type-id-865'>
+    <array-type-def dimensions='1' type-id='type-id-862' id='type-id-863'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-866' id='type-id-867'>
+    <array-type-def dimensions='1' type-id='type-id-864' id='type-id-865'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-868' id='type-id-869'>
+    <array-type-def dimensions='1' type-id='type-id-866' id='type-id-867'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-870' id='type-id-871'>
+    <array-type-def dimensions='1' type-id='type-id-868' id='type-id-869'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-872' id='type-id-873'>
+    <array-type-def dimensions='1' type-id='type-id-870' id='type-id-871'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-874' id='type-id-875'>
+    <array-type-def dimensions='1' type-id='type-id-872' id='type-id-873'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-876' id='type-id-877'>
+    <array-type-def dimensions='1' type-id='type-id-874' id='type-id-875'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-878' id='type-id-879'>
+    <array-type-def dimensions='1' type-id='type-id-876' id='type-id-877'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-880' id='type-id-881'>
+    <array-type-def dimensions='1' type-id='type-id-878' id='type-id-879'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-882' id='type-id-883'>
+    <array-type-def dimensions='1' type-id='type-id-880' id='type-id-881'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-884' id='type-id-885'>
+    <array-type-def dimensions='1' type-id='type-id-882' id='type-id-883'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-886' id='type-id-887'>
+    <array-type-def dimensions='1' type-id='type-id-884' id='type-id-885'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-888' id='type-id-889'>
+    <array-type-def dimensions='1' type-id='type-id-886' id='type-id-887'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-890' id='type-id-891'>
+    <array-type-def dimensions='1' type-id='type-id-888' id='type-id-889'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-892' id='type-id-893'>
+    <array-type-def dimensions='1' type-id='type-id-890' id='type-id-891'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-894' id='type-id-895'>
+    <array-type-def dimensions='1' type-id='type-id-892' id='type-id-893'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-896' id='type-id-897'>
+    <array-type-def dimensions='1' type-id='type-id-894' id='type-id-895'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-898' id='type-id-899'>
+    <array-type-def dimensions='1' type-id='type-id-896' id='type-id-897'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-900' id='type-id-901'>
+    <array-type-def dimensions='1' type-id='type-id-898' id='type-id-899'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-902' id='type-id-903'>
+    <array-type-def dimensions='1' type-id='type-id-900' id='type-id-901'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-904' id='type-id-905'>
+    <array-type-def dimensions='1' type-id='type-id-902' id='type-id-903'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- RangeRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-906' id='type-id-907'>
+    <array-type-def dimensions='1' type-id='type-id-904' id='type-id-905'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- Record<OT::Feature>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-908' id='type-id-909'>
+    <array-type-def dimensions='1' type-id='type-id-906' id='type-id-907'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- Record<OT::LangSys>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-910' id='type-id-911'>
+    <array-type-def dimensions='1' type-id='type-id-908' id='type-id-909'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- Record<OT::Script>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-912' id='type-id-913'>
+    <array-type-def dimensions='1' type-id='type-id-910' id='type-id-911'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- Value[1] -->
-    <array-type-def dimensions='1' type-id='type-id-914' id='type-id-915'>
+    <array-type-def dimensions='1' type-id='type-id-912' id='type-id-913'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <!-- bool[2] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16' id='type-id-916'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16' id='type-id-914'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
     <!-- feature_map_t[8] -->
-    <array-type-def dimensions='1' type-id='type-id-917' size-in-bits='2304' id='type-id-918'>
+    <array-type-def dimensions='1' type-id='type-id-915' size-in-bits='2304' id='type-id-916'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
     <!-- lookup_map_t[32] -->
-    <array-type-def dimensions='1' type-id='type-id-919' size-in-bits='2048' id='type-id-920'>
+    <array-type-def dimensions='1' type-id='type-id-917' size-in-bits='2048' id='type-id-918'>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' type-id='type-id-4' id='type-id-921'/>
+      <subrange length='32' type-id='type-id-4' id='type-id-919'/>
     </array-type-def>
     <!-- stage_map_t[4] -->
-    <array-type-def dimensions='1' type-id='type-id-922' size-in-bits='512' id='type-id-923'>
+    <array-type-def dimensions='1' type-id='type-id-920' size-in-bits='512' id='type-id-921'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>[2] -->
-    <array-type-def dimensions='1' type-id='type-id-924' size-in-bits='4352' id='type-id-925'>
+    <array-type-def dimensions='1' type-id='type-id-922' size-in-bits='4352' id='type-id-923'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>[2] -->
-    <array-type-def dimensions='1' type-id='type-id-926' size-in-bits='1280' id='type-id-927'>
+    <array-type-def dimensions='1' type-id='type-id-924' size-in-bits='1280' id='type-id-925'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
     <!-- hb_tag_t[2] -->
-    <array-type-def dimensions='1' type-id='type-id-187' size-in-bits='64' id='type-id-928'>
+    <array-type-def dimensions='1' type-id='type-id-185' size-in-bits='64' id='type-id-926'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
     <!-- void*[3] -->
-    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-929'>
+    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-927'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' type-id='type-id-4' id='type-id-691'/>
+      <subrange length='3' type-id='type-id-4' id='type-id-689'/>
     </array-type-def>
     <!-- struct hb_ot_layout_lookup_accelerator_t -->
-    <class-decl name='hb_ot_layout_lookup_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='121' column='1' id='type-id-930'>
+    <class-decl name='hb_ot_layout_lookup_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='121' column='1' id='type-id-928'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_set_digest_t hb_ot_layout_lookup_accelerator_t::digest -->
-        <var-decl name='digest' type-id='type-id-931' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='134' column='1'/>
+        <var-decl name='digest' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='134' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void hb_ot_layout_lookup_accelerator_t::fini<OT::SubstLookup>(const OT::SubstLookup&) -->
         <function-decl name='fini&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_layout_lookup_accelerator_t*' -->
-          <parameter type-id='type-id-932' is-artificial='yes'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
           <!-- parameter of type 'const OT::SubstLookup&' -->
-          <parameter type-id='type-id-933'/>
+          <parameter type-id='type-id-931'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13046,9 +13033,9 @@
         <!-- void hb_ot_layout_lookup_accelerator_t::fini<OT::PosLookup>(const OT::PosLookup&) -->
         <function-decl name='fini&lt;OT::PosLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_layout_lookup_accelerator_t*' -->
-          <parameter type-id='type-id-932' is-artificial='yes'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
           <!-- parameter of type 'const OT::PosLookup&' -->
-          <parameter type-id='type-id-934'/>
+          <parameter type-id='type-id-932'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13057,9 +13044,9 @@
         <!-- void hb_ot_layout_lookup_accelerator_t::init<OT::SubstLookup>(const OT::SubstLookup&) -->
         <function-decl name='init&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_layout_lookup_accelerator_t*' -->
-          <parameter type-id='type-id-932' is-artificial='yes'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
           <!-- parameter of type 'const OT::SubstLookup&' -->
-          <parameter type-id='type-id-933'/>
+          <parameter type-id='type-id-931'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13068,9 +13055,9 @@
         <!-- void hb_ot_layout_lookup_accelerator_t::init<OT::PosLookup>(const OT::PosLookup&) -->
         <function-decl name='init&lt;OT::PosLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_layout_lookup_accelerator_t*' -->
-          <parameter type-id='type-id-932' is-artificial='yes'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
           <!-- parameter of type 'const OT::PosLookup&' -->
-          <parameter type-id='type-id-934'/>
+          <parameter type-id='type-id-932'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13079,9 +13066,9 @@
         <!-- void hb_ot_layout_lookup_accelerator_t::fini<OT::SubstLookup*>(OT::SubstLookup* const&) -->
         <function-decl name='fini&lt;OT::SubstLookup*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_layout_lookup_accelerator_t*' -->
-          <parameter type-id='type-id-932' is-artificial='yes'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
           <!-- parameter of type 'OT::SubstLookup* const&' -->
-          <parameter type-id='type-id-935'/>
+          <parameter type-id='type-id-933'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13090,19 +13077,19 @@
         <!-- void hb_ot_layout_lookup_accelerator_t::init<OT::SubstLookup>(const OT::SubstLookup&) -->
         <function-decl name='init&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_layout_lookup_accelerator_t*' -->
-          <parameter type-id='type-id-932' is-artificial='yes'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
           <!-- parameter of type 'const OT::SubstLookup&' -->
-          <parameter type-id='type-id-933'/>
+          <parameter type-id='type-id-931'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct GSUBProxy -->
-    <class-decl name='GSUBProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='804' column='1' id='type-id-936'>
+    <class-decl name='GSUBProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='804' column='1' id='type-id-934'>
       <member-type access='public'>
         <!-- typedef OT::SubstLookup GSUBProxy::Lookup -->
-        <typedef-decl name='Lookup' type-id='type-id-938' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='807' column='1' id='type-id-937'/>
+        <typedef-decl name='Lookup' type-id='type-id-936' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='807' column='1' id='type-id-935'/>
       </member-type>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int GSUBProxy::table_index -->
@@ -13110,33 +13097,33 @@
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const bool GSUBProxy::inplace -->
-        <var-decl name='inplace' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='806' column='1'/>
+        <var-decl name='inplace' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='806' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const OT::GSUB& GSUBProxy::table -->
-        <var-decl name='table' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='813' column='1'/>
+        <var-decl name='table' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='813' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const hb_ot_layout_lookup_accelerator_t* GSUBProxy::accels -->
-        <var-decl name='accels' type-id='type-id-941' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='814' column='1'/>
+        <var-decl name='accels' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='814' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- GSUBProxy::GSUBProxy(hb_face_t*) -->
         <function-decl name='GSUBProxy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='809' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GSUBProxy*' -->
-          <parameter type-id='type-id-942' is-artificial='yes'/>
+          <parameter type-id='type-id-940' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct GPOSProxy -->
-    <class-decl name='GPOSProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='818' column='1' id='type-id-943'>
+    <class-decl name='GPOSProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='818' column='1' id='type-id-941'>
       <member-type access='public'>
         <!-- typedef OT::PosLookup GPOSProxy::Lookup -->
-        <typedef-decl name='Lookup' type-id='type-id-945' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='821' column='1' id='type-id-944'/>
+        <typedef-decl name='Lookup' type-id='type-id-943' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='821' column='1' id='type-id-942'/>
       </member-type>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int GPOSProxy::table_index -->
@@ -13144,30 +13131,30 @@
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const bool GPOSProxy::inplace -->
-        <var-decl name='inplace' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='820' column='1'/>
+        <var-decl name='inplace' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='820' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const OT::GPOS& GPOSProxy::table -->
-        <var-decl name='table' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='827' column='1'/>
+        <var-decl name='table' type-id='type-id-944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='827' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const hb_ot_layout_lookup_accelerator_t* GPOSProxy::accels -->
-        <var-decl name='accels' type-id='type-id-941' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='828' column='1'/>
+        <var-decl name='accels' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='828' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- GPOSProxy::GPOSProxy(hb_face_t*) -->
         <function-decl name='GPOSProxy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GPOSProxy*' -->
-          <parameter type-id='type-id-947' is-artificial='yes'/>
+          <parameter type-id='type-id-945' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- enum hb_ot_layout_glyph_class_t -->
-    <enum-decl name='hb_ot_layout_glyph_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.h' line='54' column='1' id='type-id-948'>
+    <enum-decl name='hb_ot_layout_glyph_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.h' line='54' column='1' id='type-id-946'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED' value='0'/>
       <enumerator name='HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH' value='1'/>
@@ -13176,13 +13163,13 @@
       <enumerator name='HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT' value='4'/>
     </enum-decl>
     <!-- struct hb_ot_map_t -->
-    <class-decl name='hb_ot_map_t' size-in-bits='8192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='40' column='1' id='type-id-949'>
+    <class-decl name='hb_ot_map_t' size-in-bits='8192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='40' column='1' id='type-id-947'>
       <member-type access='public'>
         <!-- struct hb_ot_map_t::feature_map_t -->
-        <class-decl name='feature_map_t' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='45' column='1' id='type-id-917'>
+        <class-decl name='feature_map_t' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='45' column='1' id='type-id-915'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- hb_tag_t hb_ot_map_t::feature_map_t::tag -->
-            <var-decl name='tag' type-id='type-id-187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='46' column='1'/>
+            <var-decl name='tag' type-id='type-id-185' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='46' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- unsigned int hb_ot_map_t::feature_map_t::index[2] -->
@@ -13216,9 +13203,9 @@
             <!-- int hb_ot_map_t::feature_map_t::cmp(const hb_ot_map_t::feature_map_t*) -->
             <function-decl name='cmp' mangled-name='_ZN11hb_ot_map_t13feature_map_t3cmpEPKS0_S2_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- parameter of type 'const hb_ot_map_t::feature_map_t*' -->
-              <parameter type-id='type-id-950'/>
+              <parameter type-id='type-id-948'/>
               <!-- parameter of type 'const hb_ot_map_t::feature_map_t*' -->
-              <parameter type-id='type-id-950'/>
+              <parameter type-id='type-id-948'/>
               <!-- int -->
               <return type-id='type-id-9'/>
             </function-decl>
@@ -13227,7 +13214,7 @@
       </member-type>
       <member-type access='public'>
         <!-- struct hb_ot_map_t::lookup_map_t -->
-        <class-decl name='lookup_map_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='59' column='1' id='type-id-919'>
+        <class-decl name='lookup_map_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='59' column='1' id='type-id-917'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned short int hb_ot_map_t::lookup_map_t::index -->
             <var-decl name='index' type-id='type-id-81' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='60' column='1'/>
@@ -13244,9 +13231,9 @@
             <!-- int hb_ot_map_t::lookup_map_t::cmp(const hb_ot_map_t::lookup_map_t*) -->
             <function-decl name='cmp' mangled-name='_ZN11hb_ot_map_t12lookup_map_t3cmpEPKS0_S2_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- parameter of type 'const hb_ot_map_t::lookup_map_t*' -->
-              <parameter type-id='type-id-951'/>
+              <parameter type-id='type-id-949'/>
               <!-- parameter of type 'const hb_ot_map_t::lookup_map_t*' -->
-              <parameter type-id='type-id-951'/>
+              <parameter type-id='type-id-949'/>
               <!-- int -->
               <return type-id='type-id-9'/>
             </function-decl>
@@ -13255,10 +13242,10 @@
       </member-type>
       <member-type access='public'>
         <!-- struct hb_ot_map_t::stage_map_t -->
-        <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-922'>
+        <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-920'>
           <member-type access='public'>
             <!-- typedef void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* hb_ot_map_t::stage_map_t::pause_func_t -->
-            <typedef-decl name='pause_func_t' type-id='type-id-953' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-952'/>
+            <typedef-decl name='pause_func_t' type-id='type-id-951' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-950'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned int hb_ot_map_t::stage_map_t::last_lookup -->
@@ -13266,17 +13253,17 @@
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- hb_ot_map_t::stage_map_t::pause_func_t hb_ot_map_t::stage_map_t::pause_func -->
-            <var-decl name='pause_func' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='72' column='1'/>
+            <var-decl name='pause_func' type-id='type-id-950' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='72' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_tag_t hb_ot_map_t::chosen_script[2] -->
-        <var-decl name='chosen_script' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='137' column='1'/>
+        <var-decl name='chosen_script' type-id='type-id-926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- bool hb_ot_map_t::found_script[2] -->
-        <var-decl name='found_script' type-id='type-id-916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='138' column='1'/>
+        <var-decl name='found_script' type-id='type-id-914' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- hb_mask_t hb_ot_map_t::global_mask -->
@@ -13284,21 +13271,21 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u> hb_ot_map_t::features -->
-        <var-decl name='features' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='150' column='1'/>
+        <var-decl name='features' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='150' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u> hb_ot_map_t::lookups[2] -->
-        <var-decl name='lookups' type-id='type-id-925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='151' column='1'/>
+        <var-decl name='lookups' type-id='type-id-923' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='151' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6912'>
         <!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u> hb_ot_map_t::stages[2] -->
-        <var-decl name='stages' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='152' column='1'/>
+        <var-decl name='stages' type-id='type-id-925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='152' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13307,11 +13294,11 @@
         <!-- void hb_ot_map_t::apply<GSUBProxy>(const GSUBProxy&, const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
         <function-decl name='apply&lt;GSUBProxy&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='902' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'const GSUBProxy&' -->
-          <parameter type-id='type-id-957'/>
+          <parameter type-id='type-id-955'/>
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958'/>
+          <parameter type-id='type-id-956'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_buffer_t*' -->
@@ -13324,11 +13311,11 @@
         <!-- void hb_ot_map_t::apply<GPOSProxy>(const GPOSProxy&, const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
         <function-decl name='apply&lt;GPOSProxy&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='902' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'const GPOSProxy&' -->
-          <parameter type-id='type-id-959'/>
+          <parameter type-id='type-id-957'/>
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958'/>
+          <parameter type-id='type-id-956'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_buffer_t*' -->
@@ -13341,9 +13328,9 @@
         <!-- void hb_ot_map_t::position(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
         <function-decl name='position' mangled-name='_ZNK11hb_ot_map_t8positionEPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958'/>
+          <parameter type-id='type-id-956'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_buffer_t*' -->
@@ -13356,9 +13343,9 @@
         <!-- void hb_ot_map_t::substitute(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
         <function-decl name='substitute' mangled-name='_ZNK11hb_ot_map_t10substituteEPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958'/>
+          <parameter type-id='type-id-956'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_buffer_t*' -->
@@ -13371,7 +13358,7 @@
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13380,11 +13367,11 @@
         <!-- void hb_ot_map_t::collect_lookups(unsigned int, hb_set_t*) -->
         <function-decl name='collect_lookups' mangled-name='_ZNK11hb_ot_map_t15collect_lookupsEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-960'/>
+          <parameter type-id='type-id-958'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13393,9 +13380,9 @@
         <!-- void hb_ot_map_t::add_lookups(hb_face_t*, unsigned int, unsigned int, hb_mask_t, bool) -->
         <function-decl name='add_lookups' mangled-name='_ZN11hb_ot_map_t11add_lookupsEP9hb_face_tjjjb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'unsigned int' -->
@@ -13412,7 +13399,7 @@
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13421,7 +13408,7 @@
         <!-- hb_mask_t hb_ot_map_t::get_global_mask() -->
         <function-decl name='get_global_mask' mangled-name='_ZNK11hb_ot_map_t15get_global_maskEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- typedef hb_mask_t -->
           <return type-id='type-id-92'/>
         </function-decl>
@@ -13430,9 +13417,9 @@
         <!-- hb_mask_t hb_ot_map_t::get_mask(hb_tag_t, unsigned int*) -->
         <function-decl name='get_mask' mangled-name='_ZNK11hb_ot_map_t8get_maskEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- typedef hb_mask_t -->
@@ -13443,7 +13430,7 @@
         <!-- void hb_ot_map_t::finish() -->
         <function-decl name='finish' mangled-name='_ZN11hb_ot_map_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13452,9 +13439,9 @@
         <!-- hb_mask_t hb_ot_map_t::get_1_mask(hb_tag_t) -->
         <function-decl name='get_1_mask' mangled-name='_ZNK11hb_ot_map_t10get_1_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- typedef hb_mask_t -->
           <return type-id='type-id-92'/>
         </function-decl>
@@ -13463,7 +13450,7 @@
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13472,9 +13459,9 @@
         <!-- bool hb_ot_map_t::needs_fallback(hb_tag_t) -->
         <function-decl name='needs_fallback' mangled-name='_ZNK11hb_ot_map_t14needs_fallbackEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- bool -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -13483,7 +13470,7 @@
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13492,7 +13479,7 @@
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13501,11 +13488,11 @@
         <!-- unsigned int hb_ot_map_t::get_feature_stage(unsigned int, hb_tag_t) -->
         <function-decl name='get_feature_stage' mangled-name='_ZNK11hb_ot_map_t17get_feature_stageEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- unsigned int -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -13514,13 +13501,13 @@
         <!-- void hb_ot_map_t::get_stage_lookups(unsigned int, unsigned int, const hb_ot_map_t::lookup_map_t**, unsigned int*) -->
         <function-decl name='get_stage_lookups' mangled-name='_ZNK11hb_ot_map_t17get_stage_lookupsEjjPPKNS_12lookup_map_tEPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'const hb_ot_map_t::lookup_map_t**' -->
-          <parameter type-id='type-id-961'/>
+          <parameter type-id='type-id-959'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- void -->
@@ -13531,7 +13518,7 @@
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13540,7 +13527,7 @@
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13549,16 +13536,16 @@
         <!-- hb_ot_map_t::hb_ot_map_t() -->
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct _hb_void_t -->
-    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-962'/>
+    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-960'/>
     <!-- struct hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u> -->
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::feature_map_t, 8u&gt;' size-in-bits='2432' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-954'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::feature_map_t, 8u&gt;' size-in-bits='2432' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-952'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::len -->
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
@@ -13569,48 +13556,48 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_ot_map_t::feature_map_t* hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::array -->
-        <var-decl name='array' type-id='type-id-963' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_ot_map_t::feature_map_t hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::static_array[8] -->
-        <var-decl name='static_array' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- hb_ot_map_t::feature_map_t* hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::push() -->
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t13feature_map_tELj8EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>*' -->
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- hb_ot_map_t::feature_map_t* -->
-          <return type-id='type-id-963'/>
+          <return type-id='type-id-961'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_ot_map_t::feature_map_t& hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::operator[](unsigned int) -->
         <function-decl name='operator[]' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t13feature_map_tELj8EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>*' -->
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- hb_ot_map_t::feature_map_t& -->
-          <return type-id='type-id-965'/>
+          <return type-id='type-id-963'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- const hb_ot_map_t::feature_map_t* hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::bsearch<hb_tag_t>(hb_tag_t*) -->
         <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>*' -->
-          <parameter type-id='type-id-966' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <!-- parameter of type 'hb_tag_t*' -->
-          <parameter type-id='type-id-967'/>
+          <parameter type-id='type-id-965'/>
           <!-- const hb_ot_map_t::feature_map_t* -->
-          <return type-id='type-id-950'/>
+          <return type-id='type-id-948'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::finish() -->
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t13feature_map_tELj8EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>*' -->
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13619,38 +13606,38 @@
         <!-- const hb_ot_map_t::feature_map_t* hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::bsearch<hb_tag_t>(hb_tag_t*) -->
         <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>*' -->
-          <parameter type-id='type-id-966' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <!-- parameter of type 'hb_tag_t*' -->
-          <parameter type-id='type-id-967'/>
+          <parameter type-id='type-id-965'/>
           <!-- const hb_ot_map_t::feature_map_t* -->
-          <return type-id='type-id-950'/>
+          <return type-id='type-id-948'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- const hb_ot_map_t::feature_map_t* hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::bsearch<hb_tag_t>(hb_tag_t*) -->
         <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>*' -->
-          <parameter type-id='type-id-966' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <!-- parameter of type 'hb_tag_t*' -->
-          <parameter type-id='type-id-967'/>
+          <parameter type-id='type-id-965'/>
           <!-- const hb_ot_map_t::feature_map_t* -->
-          <return type-id='type-id-950'/>
+          <return type-id='type-id-948'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- const hb_ot_map_t::feature_map_t* hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>::bsearch<hb_tag_t>(hb_tag_t*) -->
         <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>*' -->
-          <parameter type-id='type-id-966' is-artificial='yes'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
           <!-- parameter of type 'hb_tag_t*' -->
-          <parameter type-id='type-id-967'/>
+          <parameter type-id='type-id-965'/>
           <!-- const hb_ot_map_t::feature_map_t* -->
-          <return type-id='type-id-950'/>
+          <return type-id='type-id-948'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u> -->
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::lookup_map_t, 32u&gt;' size-in-bits='2176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-924'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::lookup_map_t, 32u&gt;' size-in-bits='2176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-922'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::len -->
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
@@ -13661,37 +13648,37 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_ot_map_t::lookup_map_t* hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::array -->
-        <var-decl name='array' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-966' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_ot_map_t::lookup_map_t hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::static_array[32] -->
-        <var-decl name='static_array' type-id='type-id-920' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- const hb_ot_map_t::lookup_map_t& hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::operator[](unsigned int) -->
         <function-decl name='operator[]' mangled-name='_ZNK21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>*' -->
-          <parameter type-id='type-id-969' is-artificial='yes'/>
+          <parameter type-id='type-id-967' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- const hb_ot_map_t::lookup_map_t& -->
-          <return type-id='type-id-970'/>
+          <return type-id='type-id-968'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_ot_map_t::lookup_map_t* hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::push() -->
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>*' -->
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <!-- hb_ot_map_t::lookup_map_t* -->
-          <return type-id='type-id-968'/>
+          <return type-id='type-id-966'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::qsort(unsigned int, unsigned int) -->
         <function-decl name='qsort' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EE5qsortEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>*' -->
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'unsigned int' -->
@@ -13704,18 +13691,18 @@
         <!-- hb_ot_map_t::lookup_map_t& hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::operator[](unsigned int) -->
         <function-decl name='operator[]' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>*' -->
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- hb_ot_map_t::lookup_map_t& -->
-          <return type-id='type-id-972'/>
+          <return type-id='type-id-970'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::shrink(unsigned int) -->
         <function-decl name='shrink' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EE6shrinkEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>*' -->
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- void -->
@@ -13726,14 +13713,14 @@
         <!-- void hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>::finish() -->
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>*' -->
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u> -->
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::stage_map_t, 4u&gt;' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-926'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::stage_map_t, 4u&gt;' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-924'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>::len -->
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
@@ -13744,49 +13731,49 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_ot_map_t::stage_map_t* hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>::array -->
-        <var-decl name='array' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_ot_map_t::stage_map_t hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>::static_array[4] -->
-        <var-decl name='static_array' type-id='type-id-923' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-921' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- const hb_ot_map_t::stage_map_t& hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>::operator[](unsigned int) -->
         <function-decl name='operator[]' mangled-name='_ZNK21hb_prealloced_array_tIN11hb_ot_map_t11stage_map_tELj4EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>*' -->
-          <parameter type-id='type-id-974' is-artificial='yes'/>
+          <parameter type-id='type-id-972' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- const hb_ot_map_t::stage_map_t& -->
-          <return type-id='type-id-975'/>
+          <return type-id='type-id-973'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_ot_map_t::stage_map_t* hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>::push() -->
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t11stage_map_tELj4EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>*' -->
-          <parameter type-id='type-id-976' is-artificial='yes'/>
+          <parameter type-id='type-id-974' is-artificial='yes'/>
           <!-- hb_ot_map_t::stage_map_t* -->
-          <return type-id='type-id-973'/>
+          <return type-id='type-id-971'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>::finish() -->
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t11stage_map_tELj4EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>*' -->
-          <parameter type-id='type-id-976' is-artificial='yes'/>
+          <parameter type-id='type-id-974' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_auto_trace_t<0, const OT::Coverage&> -->
-    <class-decl name='hb_auto_trace_t&lt;0, const OT::Coverage&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-977'>
+    <class-decl name='hb_auto_trace_t&lt;0, const OT::Coverage&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-975'>
       <member-function access='public'>
         <!-- void hb_auto_trace_t<0, const OT::Coverage&>::hb_auto_trace_t(unsigned int*, const char*, void*, const char*, const char*, ...) -->
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, const OT::Coverage&>*' -->
-          <parameter type-id='type-id-978' is-artificial='yes'/>
+          <parameter type-id='type-id-976' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'const char*' -->
@@ -13806,20 +13793,20 @@
         <!-- const OT::Coverage& hb_auto_trace_t<0, const OT::Coverage&>::ret(const OT::Coverage&, unsigned int) -->
         <function-decl name='ret' mangled-name='_ZN15hb_auto_trace_tILi0ERKN2OT8CoverageEE3retES3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, const OT::Coverage&>*' -->
-          <parameter type-id='type-id-978' is-artificial='yes'/>
+          <parameter type-id='type-id-976' is-artificial='yes'/>
           <!-- parameter of type 'const OT::Coverage&' -->
-          <parameter type-id='type-id-979'/>
+          <parameter type-id='type-id-977'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- const OT::Coverage& -->
-          <return type-id='type-id-979'/>
+          <return type-id='type-id-977'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_auto_trace_t<0, const OT::Coverage&>::hb_auto_trace_t(unsigned int*, const char*, void*, const char*, const char*, ...) -->
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, const OT::Coverage&>*' -->
-          <parameter type-id='type-id-978' is-artificial='yes'/>
+          <parameter type-id='type-id-976' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'const char*' -->
@@ -13837,12 +13824,12 @@
       </member-function>
     </class-decl>
     <!-- struct hb_auto_trace_t<0, const _hb_void_t&> -->
-    <class-decl name='hb_auto_trace_t&lt;0, const _hb_void_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-980'>
+    <class-decl name='hb_auto_trace_t&lt;0, const _hb_void_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-978'>
       <member-function access='public'>
         <!-- void hb_auto_trace_t<0, const _hb_void_t&>::hb_auto_trace_t(unsigned int*, const char*, void*, const char*, const char*, ...) -->
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, const _hb_void_t&>*' -->
-          <parameter type-id='type-id-981' is-artificial='yes'/>
+          <parameter type-id='type-id-979' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-59'/>
           <!-- parameter of type 'const char*' -->
@@ -13862,18 +13849,18 @@
         <!-- const _hb_void_t& hb_auto_trace_t<0, const _hb_void_t&>::ret(const _hb_void_t&, unsigned int) -->
         <function-decl name='ret' mangled-name='_ZN15hb_auto_trace_tILi0ERK10_hb_void_tE3retES2_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_auto_trace_t<0, const _hb_void_t&>*' -->
-          <parameter type-id='type-id-981' is-artificial='yes'/>
+          <parameter type-id='type-id-979' is-artificial='yes'/>
           <!-- parameter of type 'const _hb_void_t&' -->
-          <parameter type-id='type-id-982'/>
+          <parameter type-id='type-id-980'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- const _hb_void_t& -->
-          <return type-id='type-id-982'/>
+          <return type-id='type-id-980'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 0u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-983'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-981'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 0u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -13903,7 +13890,7 @@
         <!-- bool hb_set_digest_lowest_bits_t<long unsigned int, 0u>::may_have(unsigned int) -->
         <function-decl name='may_have' mangled-name='_ZNK27hb_set_digest_lowest_bits_tImLj0EE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_digest_lowest_bits_t<long unsigned int, 0u>*' -->
-          <parameter type-id='type-id-984' is-artificial='yes'/>
+          <parameter type-id='type-id-982' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- bool -->
@@ -13914,7 +13901,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 0u>::init() -->
         <function-decl name='init' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj0EE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 0u>*' -->
-          <parameter type-id='type-id-985' is-artificial='yes'/>
+          <parameter type-id='type-id-983' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13923,7 +13910,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 0u>::add(unsigned int) -->
         <function-decl name='add' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj0EE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 0u>*' -->
-          <parameter type-id='type-id-985' is-artificial='yes'/>
+          <parameter type-id='type-id-983' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- void -->
@@ -13934,7 +13921,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 0u>::add_range(unsigned int, unsigned int) -->
         <function-decl name='add_range' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj0EE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 0u>*' -->
-          <parameter type-id='type-id-985' is-artificial='yes'/>
+          <parameter type-id='type-id-983' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'unsigned int' -->
@@ -13945,7 +13932,7 @@
       </member-function>
     </class-decl>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 4u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-986'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-984'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 4u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -13975,7 +13962,7 @@
         <!-- bool hb_set_digest_lowest_bits_t<long unsigned int, 4u>::may_have(unsigned int) -->
         <function-decl name='may_have' mangled-name='_ZNK27hb_set_digest_lowest_bits_tImLj4EE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_digest_lowest_bits_t<long unsigned int, 4u>*' -->
-          <parameter type-id='type-id-987' is-artificial='yes'/>
+          <parameter type-id='type-id-985' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- bool -->
@@ -13986,7 +13973,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 4u>::init() -->
         <function-decl name='init' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj4EE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 4u>*' -->
-          <parameter type-id='type-id-988' is-artificial='yes'/>
+          <parameter type-id='type-id-986' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -13995,7 +13982,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 4u>::add(unsigned int) -->
         <function-decl name='add' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj4EE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 4u>*' -->
-          <parameter type-id='type-id-988' is-artificial='yes'/>
+          <parameter type-id='type-id-986' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- void -->
@@ -14006,7 +13993,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 4u>::add_range(unsigned int, unsigned int) -->
         <function-decl name='add_range' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj4EE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 4u>*' -->
-          <parameter type-id='type-id-988' is-artificial='yes'/>
+          <parameter type-id='type-id-986' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'unsigned int' -->
@@ -14017,7 +14004,7 @@
       </member-function>
     </class-decl>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 9u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-989'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-987'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 9u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -14047,7 +14034,7 @@
         <!-- bool hb_set_digest_lowest_bits_t<long unsigned int, 9u>::may_have(unsigned int) -->
         <function-decl name='may_have' mangled-name='_ZNK27hb_set_digest_lowest_bits_tImLj9EE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_digest_lowest_bits_t<long unsigned int, 9u>*' -->
-          <parameter type-id='type-id-990' is-artificial='yes'/>
+          <parameter type-id='type-id-988' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- bool -->
@@ -14058,7 +14045,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 9u>::init() -->
         <function-decl name='init' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj9EE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 9u>*' -->
-          <parameter type-id='type-id-991' is-artificial='yes'/>
+          <parameter type-id='type-id-989' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -14067,7 +14054,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 9u>::add(unsigned int) -->
         <function-decl name='add' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj9EE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 9u>*' -->
-          <parameter type-id='type-id-991' is-artificial='yes'/>
+          <parameter type-id='type-id-989' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- void -->
@@ -14078,7 +14065,7 @@
         <!-- void hb_set_digest_lowest_bits_t<long unsigned int, 9u>::add_range(unsigned int, unsigned int) -->
         <function-decl name='add_range' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj9EE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_lowest_bits_t<long unsigned int, 9u>*' -->
-          <parameter type-id='type-id-991' is-artificial='yes'/>
+          <parameter type-id='type-id-989' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'unsigned int' -->
@@ -14089,20 +14076,20 @@
       </member-function>
     </class-decl>
     <!-- struct hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > -->
-    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-992'>
+    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-990'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 0u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::head -->
-        <var-decl name='head' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 9u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::tail -->
-        <var-decl name='tail' type-id='type-id-989' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-987' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- bool hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::may_have(unsigned int) -->
         <function-decl name='may_have' mangled-name='_ZNK24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj0EES0_ImLj9EEE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >*' -->
-          <parameter type-id='type-id-993' is-artificial='yes'/>
+          <parameter type-id='type-id-991' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- bool -->
@@ -14113,7 +14100,7 @@
         <!-- void hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::init() -->
         <function-decl name='init' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj0EES0_ImLj9EEE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >*' -->
-          <parameter type-id='type-id-994' is-artificial='yes'/>
+          <parameter type-id='type-id-992' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -14122,7 +14109,7 @@
         <!-- void hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::add(unsigned int) -->
         <function-decl name='add' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj0EES0_ImLj9EEE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >*' -->
-          <parameter type-id='type-id-994' is-artificial='yes'/>
+          <parameter type-id='type-id-992' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- void -->
@@ -14133,7 +14120,7 @@
         <!-- void hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::add_range(unsigned int, unsigned int) -->
         <function-decl name='add_range' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj0EES0_ImLj9EEE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >*' -->
-          <parameter type-id='type-id-994' is-artificial='yes'/>
+          <parameter type-id='type-id-992' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'unsigned int' -->
@@ -14144,20 +14131,20 @@
       </member-function>
     </class-decl>
     <!-- struct hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > > -->
-    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;, hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-995'>
+    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;, hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-993'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 4u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::head -->
-        <var-decl name='head' type-id='type-id-986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::tail -->
-        <var-decl name='tail' type-id='type-id-992' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::add_range(unsigned int, unsigned int) -->
         <function-decl name='add_range' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES_IS0_ImLj0EES0_ImLj9EEEE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >*' -->
-          <parameter type-id='type-id-996' is-artificial='yes'/>
+          <parameter type-id='type-id-994' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'unsigned int' -->
@@ -14170,7 +14157,7 @@
         <!-- void hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::add(unsigned int) -->
         <function-decl name='add' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES_IS0_ImLj0EES0_ImLj9EEEE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >*' -->
-          <parameter type-id='type-id-996' is-artificial='yes'/>
+          <parameter type-id='type-id-994' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- void -->
@@ -14181,7 +14168,7 @@
         <!-- void hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::init() -->
         <function-decl name='init' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES_IS0_ImLj0EES0_ImLj9EEEE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >*' -->
-          <parameter type-id='type-id-996' is-artificial='yes'/>
+          <parameter type-id='type-id-994' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -14190,7 +14177,7 @@
         <!-- bool hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::may_have(unsigned int) -->
         <function-decl name='may_have' mangled-name='_ZNK24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES_IS0_ImLj0EES0_ImLj9EEEE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >*' -->
-          <parameter type-id='type-id-997' is-artificial='yes'/>
+          <parameter type-id='type-id-995' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- bool -->
@@ -14199,560 +14186,562 @@
       </member-function>
     </class-decl>
     <!-- GPOSProxy* -->
-    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-945'/>
     <!-- GSUBProxy* -->
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-942'/>
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-940'/>
     <!-- OT::AlternateSubst* -->
-    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-999'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
     <!-- OT::AlternateSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1001'/>
+    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-999'/>
     <!-- OT::Anchor& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1002' size-in-bits='64' id='type-id-1003'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1000' size-in-bits='64' id='type-id-1001'/>
     <!-- OT::Anchor* -->
-    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-1004'/>
+    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1002'/>
     <!-- OT::AnchorFormat1* -->
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1006'/>
+    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
     <!-- OT::AnchorFormat2* -->
-    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1006'/>
     <!-- OT::AnchorFormat3* -->
-    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1010'/>
+    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
     <!-- OT::AnchorMatrix& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-1012'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1009' size-in-bits='64' id='type-id-1010'/>
     <!-- OT::AnchorMatrix* -->
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1011'/>
     <!-- OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1015'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1013'/>
     <!-- OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1015'/>
     <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-704' size-in-bits='64' id='type-id-561'/>
+    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-559'/>
     <!-- OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
     <!-- OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1021'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
     <!-- OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-1023'/>
+    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1021'/>
     <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-545'/>
+    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-543'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-1026'/>
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1024'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1028'/>
+    <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-1026'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
+    <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1028'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1032'/>
+    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1034'/>
+    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1032'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
+    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1034'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1040'/>
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-566'/>
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-564'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-564'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-562'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
+    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1048'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1048'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1052'/>
+    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1050'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1054'/>
+    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1052'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1056'/>
+    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1054'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1058'/>
+    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1056'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-1060'/>
+    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1058'/>
     <!-- OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
+    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-1060'/>
     <!-- OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1064'/>
+    <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
     <!-- OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-1066'/>
+    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1064'/>
     <!-- OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1068'/>
+    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-1066'/>
     <!-- OT::AttachList& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1069' size-in-bits='64' id='type-id-1070'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-1068'/>
     <!-- OT::AttachList* -->
-    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-1071'/>
+    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1069'/>
     <!-- OT::CaretValue& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1070' size-in-bits='64' id='type-id-1071'/>
     <!-- OT::CaretValue* -->
-    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-1074'/>
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-1072'/>
     <!-- OT::CaretValueFormat1* -->
-    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-1076'/>
+    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-1074'/>
     <!-- OT::CaretValueFormat2* -->
-    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1078'/>
+    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-1076'/>
     <!-- OT::CaretValueFormat3* -->
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1080'/>
+    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1078'/>
     <!-- OT::ChainContext* -->
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1082'/>
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1080'/>
     <!-- OT::ChainContextApplyLookupContext& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1084'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-1082'/>
     <!-- OT::ChainContextClosureLookupContext& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1086'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1084'/>
     <!-- OT::ChainContextCollectGlyphsLookupContext& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1086'/>
     <!-- OT::ChainContextFormat1* -->
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-1090'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
     <!-- OT::ChainContextFormat2* -->
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1092'/>
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-1090'/>
     <!-- OT::ChainContextFormat3* -->
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1092'/>
     <!-- OT::ChainRule& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1095' size-in-bits='64' id='type-id-1096'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
     <!-- OT::ChainRule* -->
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1095'/>
     <!-- OT::ChainRuleSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-1097'/>
     <!-- OT::ChainRuleSet* -->
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1098'/>
     <!-- OT::ClassDef& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1101' size-in-bits='64' id='type-id-1102'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
     <!-- OT::ClassDef* -->
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1103'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1101'/>
     <!-- OT::ClassDefFormat1* -->
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-1105'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
     <!-- OT::ClassDefFormat2* -->
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1107'/>
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-1105'/>
     <!-- OT::Context* -->
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1109'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1107'/>
     <!-- OT::ContextApplyLookupContext& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1110' size-in-bits='64' id='type-id-1111'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1108' size-in-bits='64' id='type-id-1109'/>
     <!-- OT::ContextClosureLookupContext& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1110' size-in-bits='64' id='type-id-1111'/>
     <!-- OT::ContextCollectGlyphsLookupContext& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
     <!-- OT::ContextFormat1* -->
-    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1117'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
     <!-- OT::ContextFormat2* -->
-    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-1119'/>
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1117'/>
     <!-- OT::ContextFormat3* -->
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-1121'/>
+    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-1119'/>
     <!-- OT::Coverage& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1122' size-in-bits='64' id='type-id-557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1120' size-in-bits='64' id='type-id-555'/>
     <!-- OT::Coverage* -->
-    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-539'/>
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-537'/>
     <!-- OT::Coverage::Iter* -->
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1124'/>
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1122'/>
     <!-- OT::CoverageFormat1* -->
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-547'/>
     <!-- OT::CoverageFormat1::Iter* -->
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1127'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-1125'/>
     <!-- OT::CoverageFormat2* -->
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-553'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-551'/>
     <!-- OT::CoverageFormat2::Iter* -->
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1130'/>
+    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1128'/>
     <!-- OT::CursivePos* -->
-    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-1132'/>
+    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1130'/>
     <!-- OT::CursivePosFormat1* -->
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-1132'/>
     <!-- OT::Device& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1136'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1134'/>
     <!-- OT::Device* -->
-    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-1137'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1135'/>
     <!-- OT::EntryExitRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-853' size-in-bits='64' id='type-id-1138'/>
+    <reference-type-def kind='lvalue' type-id='type-id-851' size-in-bits='64' id='type-id-1136'/>
     <!-- OT::EntryExitRecord* -->
-    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-1139'/>
+    <pointer-type-def type-id='type-id-851' size-in-bits='64' id='type-id-1137'/>
     <!-- OT::Extension<OT::ExtensionPos>* -->
-    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-1139'/>
     <!-- OT::Extension<OT::ExtensionSubst>* -->
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1143'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
     <!-- OT::ExtensionFormat1* -->
-    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-1145'/>
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1143'/>
     <!-- OT::Feature& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1147'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1144' size-in-bits='64' id='type-id-1145'/>
     <!-- OT::Feature* -->
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1148'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-1146'/>
     <!-- OT::FeatureParams& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1149' size-in-bits='64' id='type-id-1150'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1147' size-in-bits='64' id='type-id-1148'/>
     <!-- OT::FeatureParams* -->
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-1151'/>
+    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-1149'/>
     <!-- OT::FeatureParamsCharacterVariants* -->
-    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1151'/>
     <!-- OT::FeatureParamsSize* -->
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1155'/>
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
     <!-- OT::FeatureParamsStylisticSet* -->
-    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1155'/>
     <!-- OT::GDEF* -->
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
     <!-- OT::GPOS* -->
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
+    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
     <!-- OT::GSUB* -->
-    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
     <!-- OT::GSUBGPOS* -->
-    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-1165'/>
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
     <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-568'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-566'/>
     <!-- OT::Index& -->
-    <reference-type-def kind='lvalue' type-id='type-id-855' size-in-bits='64' id='type-id-1167'/>
+    <reference-type-def kind='lvalue' type-id='type-id-853' size-in-bits='64' id='type-id-1165'/>
     <!-- OT::IntType<unsigned int, 3u>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1168'/>
+    <reference-type-def kind='lvalue' type-id='type-id-735' size-in-bits='64' id='type-id-1166'/>
     <!-- OT::LangSys& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1169' size-in-bits='64' id='type-id-1170'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1167' size-in-bits='64' id='type-id-1168'/>
     <!-- OT::LangSys* -->
-    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-1171'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1169'/>
     <!-- OT::LigCaretList& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1172' size-in-bits='64' id='type-id-1173'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1171'/>
     <!-- OT::LigCaretList* -->
-    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1174'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1172'/>
     <!-- OT::LigGlyph& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1175' size-in-bits='64' id='type-id-1176'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1174'/>
     <!-- OT::LigGlyph* -->
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1177'/>
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1175'/>
     <!-- OT::Ligature& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-570'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1176' size-in-bits='64' id='type-id-568'/>
     <!-- OT::Ligature* -->
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-540'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-538'/>
     <!-- OT::LigatureSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1179' size-in-bits='64' id='type-id-571'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-569'/>
     <!-- OT::LigatureSet* -->
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-541'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-539'/>
     <!-- OT::LigatureSubst* -->
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-1181'/>
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1179'/>
     <!-- OT::LigatureSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-563'/>
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-561'/>
     <!-- OT::Lookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1183' size-in-bits='64' id='type-id-547'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-545'/>
     <!-- OT::Lookup* -->
-    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-544'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-542'/>
     <!-- OT::LookupRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-858' size-in-bits='64' id='type-id-1184'/>
+    <reference-type-def kind='lvalue' type-id='type-id-856' size-in-bits='64' id='type-id-1182'/>
     <!-- OT::LookupRecord* -->
-    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1185'/>
+    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-1183'/>
     <!-- OT::MarkArray& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1184' size-in-bits='64' id='type-id-1185'/>
     <!-- OT::MarkArray* -->
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1188'/>
+    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-1186'/>
     <!-- OT::MarkBasePos* -->
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-1188'/>
     <!-- OT::MarkBasePosFormat1* -->
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1192'/>
+    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
     <!-- OT::MarkGlyphSets& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1193' size-in-bits='64' id='type-id-1194'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1191' size-in-bits='64' id='type-id-1192'/>
     <!-- OT::MarkGlyphSets* -->
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1195'/>
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1193'/>
     <!-- OT::MarkGlyphSetsFormat1* -->
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1197'/>
+    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-1195'/>
     <!-- OT::MarkLigPos* -->
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1199'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1197'/>
     <!-- OT::MarkLigPosFormat1* -->
-    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1201'/>
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1199'/>
     <!-- OT::MarkMarkPos* -->
-    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1203'/>
+    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1201'/>
     <!-- OT::MarkMarkPosFormat1* -->
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-1205'/>
+    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1203'/>
     <!-- OT::MarkRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1206'/>
+    <reference-type-def kind='lvalue' type-id='type-id-858' size-in-bits='64' id='type-id-1204'/>
     <!-- OT::MarkRecord* -->
-    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-1207'/>
+    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1205'/>
     <!-- OT::MultipleSubst* -->
-    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-1209'/>
+    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1207'/>
     <!-- OT::MultipleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-1211'/>
+    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-1209'/>
     <!-- OT::Offset<OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-862' size-in-bits='64' id='type-id-1212'/>
+    <reference-type-def kind='lvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1210'/>
     <!-- OT::OffsetListOf<OT::AnchorMatrix>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1214'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1211' size-in-bits='64' id='type-id-1212'/>
     <!-- OT::OffsetListOf<OT::AnchorMatrix>* -->
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1215'/>
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-1213'/>
     <!-- OT::OffsetListOf<OT::Lookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1217'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1214' size-in-bits='64' id='type-id-1215'/>
     <!-- OT::OffsetListOf<OT::Lookup>* -->
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1218'/>
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-1216'/>
     <!-- OT::OffsetListOf<OT::PosLookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-1220'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1217' size-in-bits='64' id='type-id-1218'/>
     <!-- OT::OffsetListOf<OT::PosLookup>* -->
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-1221'/>
+    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-1219'/>
     <!-- OT::OffsetListOf<OT::SubstLookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1222' size-in-bits='64' id='type-id-1223'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1220' size-in-bits='64' id='type-id-1221'/>
     <!-- OT::OffsetListOf<OT::SubstLookup>* -->
-    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1224'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1222'/>
     <!-- OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-416'/>
+    <pointer-type-def type-id='type-id-862' size-in-bits='64' id='type-id-414'/>
     <!-- OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1225'/>
+    <reference-type-def kind='lvalue' type-id='type-id-864' size-in-bits='64' id='type-id-1223'/>
     <!-- OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-418'/>
+    <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-416'/>
     <!-- OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-868' size-in-bits='64' id='type-id-1226'/>
+    <reference-type-def kind='lvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1224'/>
     <!-- OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-421'/>
+    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-419'/>
     <!-- OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-409'/>
+    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-407'/>
     <!-- OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-870' size-in-bits='64' id='type-id-1228'/>
+    <reference-type-def kind='lvalue' type-id='type-id-868' size-in-bits='64' id='type-id-1226'/>
     <!-- OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-422'/>
+    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-420'/>
     <!-- OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-872' size-in-bits='64' id='type-id-1229'/>
+    <reference-type-def kind='lvalue' type-id='type-id-870' size-in-bits='64' id='type-id-1227'/>
     <!-- OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-427'/>
+    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-425'/>
     <!-- OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-874' size-in-bits='64' id='type-id-1230'/>
+    <reference-type-def kind='lvalue' type-id='type-id-872' size-in-bits='64' id='type-id-1228'/>
     <!-- OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-874' size-in-bits='64' id='type-id-428'/>
+    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-426'/>
     <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-408'/>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-406'/>
     <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-876' size-in-bits='64' id='type-id-1232'/>
+    <reference-type-def kind='lvalue' type-id='type-id-874' size-in-bits='64' id='type-id-1230'/>
     <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-876' size-in-bits='64' id='type-id-406'/>
+    <pointer-type-def type-id='type-id-874' size-in-bits='64' id='type-id-404'/>
     <!-- OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-878' size-in-bits='64' id='type-id-1233'/>
+    <reference-type-def kind='lvalue' type-id='type-id-876' size-in-bits='64' id='type-id-1231'/>
     <!-- OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-424'/>
+    <pointer-type-def type-id='type-id-876' size-in-bits='64' id='type-id-422'/>
     <!-- OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1234' size-in-bits='64' id='type-id-1235'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1232' size-in-bits='64' id='type-id-1233'/>
     <!-- OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-407'/>
+    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-405'/>
     <!-- OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-439'/>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-437'/>
     <!-- OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-403'/>
     <!-- OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-404'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-402'/>
     <!-- OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-410'/>
+    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-408'/>
     <!-- OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-880' size-in-bits='64' id='type-id-1240'/>
+    <reference-type-def kind='lvalue' type-id='type-id-878' size-in-bits='64' id='type-id-1238'/>
     <!-- OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-880' size-in-bits='64' id='type-id-423'/>
+    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-421'/>
     <!-- OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-882' size-in-bits='64' id='type-id-1241'/>
+    <reference-type-def kind='lvalue' type-id='type-id-880' size-in-bits='64' id='type-id-1239'/>
     <!-- OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-430'/>
+    <pointer-type-def type-id='type-id-880' size-in-bits='64' id='type-id-428'/>
     <!-- OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-1242'/>
+    <reference-type-def kind='lvalue' type-id='type-id-882' size-in-bits='64' id='type-id-1240'/>
     <!-- OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-431'/>
+    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-429'/>
     <!-- OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-886' size-in-bits='64' id='type-id-1243'/>
+    <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-1241'/>
     <!-- OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-435'/>
+    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-433'/>
     <!-- OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-1242' size-in-bits='64' id='type-id-415'/>
     <!-- OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-409'/>
     <!-- OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-419'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-417'/>
     <!-- OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-414'/>
+    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-412'/>
     <!-- OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-420'/>
+    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-418'/>
     <!-- OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-413'/>
     <!-- OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1249'/>
+    <reference-type-def kind='lvalue' type-id='type-id-888' size-in-bits='64' id='type-id-1247'/>
     <!-- OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-433'/>
+    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-431'/>
     <!-- OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-892' size-in-bits='64' id='type-id-1250'/>
+    <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1248'/>
     <!-- OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-437'/>
+    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-435'/>
     <!-- OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-1251'/>
+    <reference-type-def kind='lvalue' type-id='type-id-892' size-in-bits='64' id='type-id-1249'/>
     <!-- OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-434'/>
+    <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-432'/>
     <!-- OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-411'/>
     <!-- OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-410'/>
     <!-- OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1254'/>
+    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-1252'/>
     <!-- OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-425'/>
+    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-423'/>
     <!-- OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-898' size-in-bits='64' id='type-id-1255'/>
+    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1253'/>
     <!-- OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-424'/>
     <!-- OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-438'/>
+    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-436'/>
     <!-- OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-1257'/>
+    <reference-type-def kind='lvalue' type-id='type-id-898' size-in-bits='64' id='type-id-1255'/>
     <!-- OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-429'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-427'/>
     <!-- OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-1258'/>
+    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-1256'/>
     <!-- OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-436'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-434'/>
     <!-- OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-1259'/>
+    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-1257'/>
     <!-- OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-430'/>
     <!-- OT::PairPos* -->
-    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1261'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-1259'/>
     <!-- OT::PairPosFormat1* -->
-    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-1263'/>
+    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1261'/>
     <!-- OT::PairPosFormat2* -->
-    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-1265'/>
+    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-1263'/>
     <!-- OT::PairSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1266' size-in-bits='64' id='type-id-1267'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1264' size-in-bits='64' id='type-id-1265'/>
     <!-- OT::PairSet* -->
-    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-1268'/>
+    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-1266'/>
     <!-- OT::PairSet::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-1270'/>
+    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-1268'/>
     <!-- OT::PosLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-1271'/>
+    <reference-type-def kind='lvalue' type-id='type-id-943' size-in-bits='64' id='type-id-1269'/>
     <!-- OT::PosLookup* -->
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-1272'/>
+    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-1270'/>
     <!-- OT::PosLookupSubTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1273' size-in-bits='64' id='type-id-1274'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1271' size-in-bits='64' id='type-id-1272'/>
     <!-- OT::PosLookupSubTable* -->
-    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-1275'/>
+    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-1273'/>
     <!-- OT::RangeRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-1276'/>
+    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-1274'/>
     <!-- OT::RangeRecord* -->
-    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-1277'/>
+    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-1275'/>
     <!-- OT::Record<OT::Feature>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1278'/>
+    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-1276'/>
     <!-- OT::Record<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1279'/>
+    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-1277'/>
     <!-- OT::Record<OT::LangSys>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-910' size-in-bits='64' id='type-id-1280'/>
+    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1278'/>
     <!-- OT::Record<OT::LangSys>* -->
-    <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-1281'/>
+    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1279'/>
     <!-- OT::Record<OT::Script>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-1282'/>
+    <reference-type-def kind='lvalue' type-id='type-id-910' size-in-bits='64' id='type-id-1280'/>
     <!-- OT::Record<OT::Script>* -->
-    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-1283'/>
+    <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-1281'/>
     <!-- OT::RecordListOf<OT::Feature>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1284' size-in-bits='64' id='type-id-1285'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1282' size-in-bits='64' id='type-id-1283'/>
     <!-- OT::RecordListOf<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-1286'/>
+    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-1284'/>
     <!-- OT::RecordListOf<OT::Script>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1287' size-in-bits='64' id='type-id-1288'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-1286'/>
     <!-- OT::RecordListOf<OT::Script>* -->
-    <pointer-type-def type-id='type-id-1287' size-in-bits='64' id='type-id-1289'/>
+    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-1287'/>
     <!-- OT::ReverseChainSingleSubst* -->
-    <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
+    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-1289'/>
     <!-- OT::ReverseChainSingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1293'/>
+    <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
     <!-- OT::Rule& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1294' size-in-bits='64' id='type-id-1295'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1292' size-in-bits='64' id='type-id-1293'/>
     <!-- OT::Rule* -->
-    <pointer-type-def type-id='type-id-1294' size-in-bits='64' id='type-id-1296'/>
+    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1294'/>
     <!-- OT::RuleSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1295' size-in-bits='64' id='type-id-1296'/>
     <!-- OT::RuleSet* -->
-    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1299'/>
+    <pointer-type-def type-id='type-id-1295' size-in-bits='64' id='type-id-1297'/>
     <!-- OT::Script& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1300' size-in-bits='64' id='type-id-1301'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1298' size-in-bits='64' id='type-id-1299'/>
     <!-- OT::Script* -->
-    <pointer-type-def type-id='type-id-1300' size-in-bits='64' id='type-id-1302'/>
+    <pointer-type-def type-id='type-id-1298' size-in-bits='64' id='type-id-1300'/>
     <!-- OT::Sequence& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1304'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1301' size-in-bits='64' id='type-id-1302'/>
     <!-- OT::Sequence* -->
-    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-1305'/>
+    <pointer-type-def type-id='type-id-1301' size-in-bits='64' id='type-id-1303'/>
     <!-- OT::SinglePos* -->
-    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1307'/>
+    <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-1305'/>
     <!-- OT::SinglePosFormat1* -->
-    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-1309'/>
+    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1307'/>
     <!-- OT::SinglePosFormat2* -->
-    <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-1311'/>
+    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-1309'/>
     <!-- OT::SingleSubst* -->
-    <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-1313'/>
+    <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-1311'/>
     <!-- OT::SingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1314' size-in-bits='64' id='type-id-548'/>
+    <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-546'/>
     <!-- OT::SingleSubstFormat2* -->
-    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-559'/>
+    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-557'/>
     <!-- OT::SubstLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-938' size-in-bits='64' id='type-id-1316'/>
+    <reference-type-def kind='lvalue' type-id='type-id-936' size-in-bits='64' id='type-id-1314'/>
     <!-- OT::SubstLookup* -->
-    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-543'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-541'/>
     <!-- OT::SubstLookupSubTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1317' size-in-bits='64' id='type-id-1318'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1315' size-in-bits='64' id='type-id-1316'/>
     <!-- OT::SubstLookupSubTable* -->
-    <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-542'/>
+    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-540'/>
     <!-- OT::Supplier<OT::EntryExitRecord>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1319' size-in-bits='64' id='type-id-1320'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1317' size-in-bits='64' id='type-id-1318'/>
     <!-- OT::Supplier<OT::Index>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1321' size-in-bits='64' id='type-id-1322'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1319' size-in-bits='64' id='type-id-1320'/>
     <!-- OT::Supplier<OT::IntType<unsigned int, 3u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-1324'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1321' size-in-bits='64' id='type-id-1322'/>
     <!-- OT::Supplier<OT::LookupRecord>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1325' size-in-bits='64' id='type-id-1326'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-1324'/>
     <!-- OT::Supplier<OT::MarkRecord>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1327' size-in-bits='64' id='type-id-1328'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1325' size-in-bits='64' id='type-id-1326'/>
     <!-- OT::Supplier<OT::Offset<OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1329' size-in-bits='64' id='type-id-1330'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1327' size-in-bits='64' id='type-id-1328'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1331' size-in-bits='64' id='type-id-1332'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1329' size-in-bits='64' id='type-id-1330'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1333' size-in-bits='64' id='type-id-1334'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1331' size-in-bits='64' id='type-id-1332'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1333' size-in-bits='64' id='type-id-1334'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1349' size-in-bits='64' id='type-id-1350'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1349' size-in-bits='64' id='type-id-1350'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1353' size-in-bits='64' id='type-id-1354'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1355' size-in-bits='64' id='type-id-1356'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1353' size-in-bits='64' id='type-id-1354'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1355' size-in-bits='64' id='type-id-1356'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1359' size-in-bits='64' id='type-id-1360'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1361' size-in-bits='64' id='type-id-1362'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1359' size-in-bits='64' id='type-id-1360'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1361' size-in-bits='64' id='type-id-1362'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1365' size-in-bits='64' id='type-id-1366'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
     <!-- OT::Supplier<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1367' size-in-bits='64' id='type-id-1368'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1365' size-in-bits='64' id='type-id-1366'/>
     <!-- OT::Supplier<OT::RangeRecord>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1369' size-in-bits='64' id='type-id-1370'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1367' size-in-bits='64' id='type-id-1368'/>
     <!-- OT::Supplier<OT::Record<OT::Feature> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1371' size-in-bits='64' id='type-id-1372'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1369' size-in-bits='64' id='type-id-1370'/>
     <!-- OT::Supplier<OT::Record<OT::LangSys> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1373' size-in-bits='64' id='type-id-1374'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1371' size-in-bits='64' id='type-id-1372'/>
     <!-- OT::Supplier<OT::Record<OT::Script> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1375' size-in-bits='64' id='type-id-1376'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1373' size-in-bits='64' id='type-id-1374'/>
     <!-- OT::Supplier<unsigned int>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1377' size-in-bits='64' id='type-id-1378'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1375' size-in-bits='64' id='type-id-1376'/>
     <!-- OT::Value* -->
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-1379'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-1377'/>
     <!-- OT::ValueFormat* -->
-    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-1381'/>
+    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-1379'/>
     <!-- OT::hb_apply_context_t* -->
-    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1383'/>
+    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-1381'/>
     <!-- OT::hb_apply_context_t::matcher_t* -->
-    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-1385'/>
+    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1383'/>
     <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-1387'/>
+    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-1385'/>
     <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-1389'/>
+    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-1387'/>
     <!-- OT::hb_closure_context_t* -->
-    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-1391'/>
+    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-1389'/>
     <!-- OT::hb_collect_glyphs_context_t* -->
-    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1393'/>
+    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-1391'/>
     <!-- OT::hb_get_coverage_context_t* -->
-    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-1395'/>
+    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1393'/>
     <!-- OT::hb_would_apply_context_t* -->
+    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-1395'/>
+    <!-- typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* -->
     <pointer-type-def type-id='type-id-1396' size-in-bits='64' id='type-id-1397'/>
     <!-- bool (hb_set_t*, const OT::USHORT&, void*)* -->
     <pointer-type-def type-id='type-id-1398' size-in-bits='64' id='type-id-1399'/>
@@ -14761,369 +14750,369 @@
     <!-- bool* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1402'/>
     <!-- const GPOSProxy -->
-    <qualified-type-def type-id='type-id-943' const='yes' id='type-id-1403'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1403'/>
     <!-- const GPOSProxy& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1403' size-in-bits='64' id='type-id-959'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1403' size-in-bits='64' id='type-id-957'/>
     <!-- const GSUBProxy -->
-    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1404'/>
+    <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1404'/>
     <!-- const GSUBProxy& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1404' size-in-bits='64' id='type-id-957'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1404' size-in-bits='64' id='type-id-955'/>
     <!-- const OT::AlternateSubst -->
-    <qualified-type-def type-id='type-id-998' const='yes' id='type-id-1405'/>
+    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-1405'/>
     <!-- const OT::AlternateSubst* -->
     <pointer-type-def type-id='type-id-1405' size-in-bits='64' id='type-id-1406'/>
     <!-- const OT::AlternateSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1000' const='yes' id='type-id-1407'/>
+    <qualified-type-def type-id='type-id-998' const='yes' id='type-id-1407'/>
     <!-- const OT::AlternateSubstFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1407' size-in-bits='64' id='type-id-1408'/>
     <!-- const OT::AlternateSubstFormat1* -->
     <pointer-type-def type-id='type-id-1407' size-in-bits='64' id='type-id-1409'/>
     <!-- const OT::Anchor -->
-    <qualified-type-def type-id='type-id-1002' const='yes' id='type-id-1410'/>
+    <qualified-type-def type-id='type-id-1000' const='yes' id='type-id-1410'/>
     <!-- const OT::Anchor& -->
     <reference-type-def kind='lvalue' type-id='type-id-1410' size-in-bits='64' id='type-id-1411'/>
     <!-- const OT::Anchor* -->
     <pointer-type-def type-id='type-id-1410' size-in-bits='64' id='type-id-1412'/>
     <!-- const OT::AnchorFormat1 -->
-    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1413'/>
+    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-1413'/>
     <!-- const OT::AnchorFormat1* -->
-    <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-515'/>
+    <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-513'/>
     <!-- const OT::AnchorFormat2 -->
-    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1414'/>
+    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1414'/>
     <!-- const OT::AnchorFormat2* -->
-    <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-516'/>
+    <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-514'/>
     <!-- const OT::AnchorFormat3 -->
-    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-1415'/>
+    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1415'/>
     <!-- const OT::AnchorFormat3* -->
-    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-517'/>
+    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-515'/>
     <!-- const OT::AnchorMatrix -->
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1416'/>
+    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-1416'/>
     <!-- const OT::AnchorMatrix& -->
     <reference-type-def kind='lvalue' type-id='type-id-1416' size-in-bits='64' id='type-id-1417'/>
     <!-- const OT::AnchorMatrix* -->
-    <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-520'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1418'/>
+    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1418'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-514'/>
+    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-512'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1419'/>
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1419'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-461'/>
+    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-459'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-772' size-in-bits='64' id='type-id-1420'/>
+    <reference-type-def kind='lvalue' type-id='type-id-770' size-in-bits='64' id='type-id-1420'/>
     <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1421'/>
+    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1421'/>
     <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-470'/>
     <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1422'/>
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1422'/>
     <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-501'/>
+    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-499'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1423'/>
+    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1423'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-519'/>
+    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-517'/>
     <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1424'/>
+    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1424'/>
     <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-481'/>
+    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-479'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1025' const='yes' id='type-id-1425'/>
+    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1425'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-523'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1027' const='yes' id='type-id-1426'/>
+    <qualified-type-def type-id='type-id-1025' const='yes' id='type-id-1426'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-440'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1029' const='yes' id='type-id-1427'/>
+    <qualified-type-def type-id='type-id-1027' const='yes' id='type-id-1427'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-446'/>
+    <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-444'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1428'/>
+    <qualified-type-def type-id='type-id-1029' const='yes' id='type-id-1428'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-500'/>
+    <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-498'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-1429'/>
+    <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1429'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-499'/>
+    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-497'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1035' const='yes' id='type-id-1430'/>
+    <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-1430'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-504'/>
+    <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-502'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1431'/>
+    <qualified-type-def type-id='type-id-1035' const='yes' id='type-id-1431'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-455'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1039' const='yes' id='type-id-1432'/>
+    <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1432'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-445'/>
+    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-443'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1433'/>
+    <qualified-type-def type-id='type-id-1039' const='yes' id='type-id-1433'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-490'/>
+    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-488'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1434'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1434'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1434' size-in-bits='64' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-1434' size-in-bits='64' id='type-id-487'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1043' const='yes' id='type-id-1435'/>
+    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1435'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-480'/>
+    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-478'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1436'/>
+    <qualified-type-def type-id='type-id-1043' const='yes' id='type-id-1436'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-511'/>
+    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-509'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1437'/>
+    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1437'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-509'/>
+    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-507'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1438'/>
+    <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1438'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1438' size-in-bits='64' id='type-id-510'/>
+    <pointer-type-def type-id='type-id-1438' size-in-bits='64' id='type-id-508'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1051' const='yes' id='type-id-1439'/>
+    <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1439'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-495'/>
+    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-493'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1053' const='yes' id='type-id-1440'/>
+    <qualified-type-def type-id='type-id-1051' const='yes' id='type-id-1440'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-494'/>
+    <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-492'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1055' const='yes' id='type-id-1441'/>
+    <qualified-type-def type-id='type-id-1053' const='yes' id='type-id-1441'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-485'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1057' const='yes' id='type-id-1442'/>
+    <qualified-type-def type-id='type-id-1055' const='yes' id='type-id-1442'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-485'/>
+    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-483'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1059' const='yes' id='type-id-1443'/>
+    <qualified-type-def type-id='type-id-1057' const='yes' id='type-id-1443'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1443' size-in-bits='64' id='type-id-486'/>
+    <pointer-type-def type-id='type-id-1443' size-in-bits='64' id='type-id-484'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1061' const='yes' id='type-id-1444'/>
+    <qualified-type-def type-id='type-id-1059' const='yes' id='type-id-1444'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-440'/>
+    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-438'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1063' const='yes' id='type-id-1445'/>
+    <qualified-type-def type-id='type-id-1061' const='yes' id='type-id-1445'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-469'/>
+    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-467'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1065' const='yes' id='type-id-1446'/>
+    <qualified-type-def type-id='type-id-1063' const='yes' id='type-id-1446'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-464'/>
+    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-462'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1067' const='yes' id='type-id-1447'/>
+    <qualified-type-def type-id='type-id-1065' const='yes' id='type-id-1447'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-460'/>
+    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-458'/>
     <!-- const OT::AttachList -->
-    <qualified-type-def type-id='type-id-1069' const='yes' id='type-id-1448'/>
+    <qualified-type-def type-id='type-id-1067' const='yes' id='type-id-1448'/>
     <!-- const OT::AttachList& -->
     <reference-type-def kind='lvalue' type-id='type-id-1448' size-in-bits='64' id='type-id-1449'/>
     <!-- const OT::AttachList* -->
     <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-1450'/>
     <!-- const OT::CaretValue -->
-    <qualified-type-def type-id='type-id-1072' const='yes' id='type-id-1451'/>
+    <qualified-type-def type-id='type-id-1070' const='yes' id='type-id-1451'/>
     <!-- const OT::CaretValue& -->
     <reference-type-def kind='lvalue' type-id='type-id-1451' size-in-bits='64' id='type-id-1452'/>
     <!-- const OT::CaretValue* -->
     <pointer-type-def type-id='type-id-1451' size-in-bits='64' id='type-id-1453'/>
     <!-- const OT::CaretValueFormat1 -->
-    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1454'/>
+    <qualified-type-def type-id='type-id-1073' const='yes' id='type-id-1454'/>
     <!-- const OT::CaretValueFormat1* -->
-    <pointer-type-def type-id='type-id-1454' size-in-bits='64' id='type-id-447'/>
+    <pointer-type-def type-id='type-id-1454' size-in-bits='64' id='type-id-445'/>
     <!-- const OT::CaretValueFormat2 -->
-    <qualified-type-def type-id='type-id-1077' const='yes' id='type-id-1455'/>
+    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1455'/>
     <!-- const OT::CaretValueFormat2* -->
-    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-448'/>
+    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-446'/>
     <!-- const OT::CaretValueFormat3 -->
-    <qualified-type-def type-id='type-id-1079' const='yes' id='type-id-1456'/>
+    <qualified-type-def type-id='type-id-1077' const='yes' id='type-id-1456'/>
     <!-- const OT::CaretValueFormat3* -->
-    <pointer-type-def type-id='type-id-1456' size-in-bits='64' id='type-id-451'/>
+    <pointer-type-def type-id='type-id-1456' size-in-bits='64' id='type-id-449'/>
     <!-- const OT::ChainContext -->
-    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1457'/>
+    <qualified-type-def type-id='type-id-1079' const='yes' id='type-id-1457'/>
     <!-- const OT::ChainContext* -->
     <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
     <!-- const OT::ChainContextFormat1 -->
-    <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1459'/>
+    <qualified-type-def type-id='type-id-1087' const='yes' id='type-id-1459'/>
     <!-- const OT::ChainContextFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1459' size-in-bits='64' id='type-id-1460'/>
     <!-- const OT::ChainContextFormat1* -->
     <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-1461'/>
     <!-- const OT::ChainContextFormat2 -->
-    <qualified-type-def type-id='type-id-1091' const='yes' id='type-id-1462'/>
+    <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1462'/>
     <!-- const OT::ChainContextFormat2& -->
     <reference-type-def kind='lvalue' type-id='type-id-1462' size-in-bits='64' id='type-id-1463'/>
     <!-- const OT::ChainContextFormat2* -->
     <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-1464'/>
     <!-- const OT::ChainContextFormat3 -->
-    <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1465'/>
+    <qualified-type-def type-id='type-id-1091' const='yes' id='type-id-1465'/>
     <!-- const OT::ChainContextFormat3& -->
     <reference-type-def kind='lvalue' type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
     <!-- const OT::ChainContextFormat3* -->
     <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-1467'/>
     <!-- const OT::ChainRule -->
-    <qualified-type-def type-id='type-id-1095' const='yes' id='type-id-1468'/>
+    <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1468'/>
     <!-- const OT::ChainRule& -->
     <reference-type-def kind='lvalue' type-id='type-id-1468' size-in-bits='64' id='type-id-1469'/>
     <!-- const OT::ChainRule* -->
     <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-1470'/>
     <!-- const OT::ChainRuleSet -->
-    <qualified-type-def type-id='type-id-1098' const='yes' id='type-id-1471'/>
+    <qualified-type-def type-id='type-id-1096' const='yes' id='type-id-1471'/>
     <!-- const OT::ChainRuleSet& -->
     <reference-type-def kind='lvalue' type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
     <!-- const OT::ChainRuleSet* -->
     <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1473'/>
     <!-- const OT::ClassDef -->
-    <qualified-type-def type-id='type-id-1101' const='yes' id='type-id-1474'/>
+    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1474'/>
     <!-- const OT::ClassDef& -->
     <reference-type-def kind='lvalue' type-id='type-id-1474' size-in-bits='64' id='type-id-1475'/>
     <!-- const OT::ClassDef* -->
     <pointer-type-def type-id='type-id-1474' size-in-bits='64' id='type-id-1476'/>
     <!-- const OT::ClassDefFormat1 -->
-    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-1477'/>
+    <qualified-type-def type-id='type-id-1102' const='yes' id='type-id-1477'/>
     <!-- const OT::ClassDefFormat1* -->
-    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-453'/>
     <!-- const OT::ClassDefFormat2 -->
-    <qualified-type-def type-id='type-id-1106' const='yes' id='type-id-1478'/>
+    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-1478'/>
     <!-- const OT::ClassDefFormat2* -->
     <pointer-type-def type-id='type-id-1478' size-in-bits='64' id='type-id-1479'/>
     <!-- const OT::Context -->
-    <qualified-type-def type-id='type-id-1108' const='yes' id='type-id-1480'/>
+    <qualified-type-def type-id='type-id-1106' const='yes' id='type-id-1480'/>
     <!-- const OT::Context* -->
     <pointer-type-def type-id='type-id-1480' size-in-bits='64' id='type-id-1481'/>
     <!-- const OT::ContextFormat1 -->
-    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1482'/>
+    <qualified-type-def type-id='type-id-1114' const='yes' id='type-id-1482'/>
     <!-- const OT::ContextFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1483'/>
     <!-- const OT::ContextFormat1* -->
     <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1484'/>
     <!-- const OT::ContextFormat2 -->
-    <qualified-type-def type-id='type-id-1118' const='yes' id='type-id-1485'/>
+    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1485'/>
     <!-- const OT::ContextFormat2& -->
     <reference-type-def kind='lvalue' type-id='type-id-1485' size-in-bits='64' id='type-id-1486'/>
     <!-- const OT::ContextFormat2* -->
     <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1487'/>
     <!-- const OT::ContextFormat3 -->
-    <qualified-type-def type-id='type-id-1120' const='yes' id='type-id-1488'/>
+    <qualified-type-def type-id='type-id-1118' const='yes' id='type-id-1488'/>
     <!-- const OT::ContextFormat3& -->
     <reference-type-def kind='lvalue' type-id='type-id-1488' size-in-bits='64' id='type-id-1489'/>
     <!-- const OT::ContextFormat3* -->
-    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-496'/>
     <!-- const OT::Coverage -->
-    <qualified-type-def type-id='type-id-1122' const='yes' id='type-id-1490'/>
+    <qualified-type-def type-id='type-id-1120' const='yes' id='type-id-1490'/>
     <!-- const OT::Coverage& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-979'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-977'/>
     <!-- const OT::Coverage* -->
     <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1491'/>
     <!-- const OT::CoverageFormat1 -->
-    <qualified-type-def type-id='type-id-1125' const='yes' id='type-id-1492'/>
+    <qualified-type-def type-id='type-id-1123' const='yes' id='type-id-1492'/>
     <!-- const OT::CoverageFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1492' size-in-bits='64' id='type-id-1493'/>
     <!-- const OT::CoverageFormat1* -->
     <pointer-type-def type-id='type-id-1492' size-in-bits='64' id='type-id-1494'/>
     <!-- const OT::CoverageFormat2 -->
-    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1495'/>
+    <qualified-type-def type-id='type-id-1126' const='yes' id='type-id-1495'/>
     <!-- const OT::CoverageFormat2& -->
     <reference-type-def kind='lvalue' type-id='type-id-1495' size-in-bits='64' id='type-id-1496'/>
     <!-- const OT::CoverageFormat2* -->
     <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1497'/>
     <!-- const OT::CursivePos -->
-    <qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1498'/>
+    <qualified-type-def type-id='type-id-1129' const='yes' id='type-id-1498'/>
     <!-- const OT::CursivePos* -->
     <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
     <!-- const OT::CursivePosFormat1 -->
-    <qualified-type-def type-id='type-id-1133' const='yes' id='type-id-1500'/>
+    <qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1500'/>
     <!-- const OT::CursivePosFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1500' size-in-bits='64' id='type-id-1501'/>
     <!-- const OT::CursivePosFormat1* -->
     <pointer-type-def type-id='type-id-1500' size-in-bits='64' id='type-id-1502'/>
     <!-- const OT::Device -->
-    <qualified-type-def type-id='type-id-1135' const='yes' id='type-id-1503'/>
+    <qualified-type-def type-id='type-id-1133' const='yes' id='type-id-1503'/>
     <!-- const OT::Device& -->
     <reference-type-def kind='lvalue' type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
     <!-- const OT::Device* -->
-    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-449'/>
+    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-447'/>
     <!-- const OT::EntryExitRecord -->
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1505'/>
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-1505'/>
     <!-- const OT::EntryExitRecord& -->
     <reference-type-def kind='lvalue' type-id='type-id-1505' size-in-bits='64' id='type-id-1506'/>
     <!-- const OT::EntryExitRecord* -->
     <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-1507'/>
     <!-- const OT::Extension<OT::ExtensionPos> -->
-    <qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1508'/>
+    <qualified-type-def type-id='type-id-1138' const='yes' id='type-id-1508'/>
     <!-- const OT::Extension<OT::ExtensionPos>* -->
     <pointer-type-def type-id='type-id-1508' size-in-bits='64' id='type-id-1509'/>
     <!-- const OT::Extension<OT::ExtensionSubst> -->
-    <qualified-type-def type-id='type-id-1142' const='yes' id='type-id-1510'/>
+    <qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1510'/>
     <!-- const OT::Extension<OT::ExtensionSubst>* -->
     <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-1511'/>
     <!-- const OT::ExtensionFormat1 -->
-    <qualified-type-def type-id='type-id-1144' const='yes' id='type-id-1512'/>
+    <qualified-type-def type-id='type-id-1142' const='yes' id='type-id-1512'/>
     <!-- const OT::ExtensionFormat1* -->
-    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-505'/>
+    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-503'/>
     <!-- const OT::ExtensionSubst -->
     <qualified-type-def type-id='type-id-1513' const='yes' id='type-id-1514'/>
     <!-- const OT::ExtensionSubst* -->
     <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-1515'/>
     <!-- const OT::Feature -->
-    <qualified-type-def type-id='type-id-1146' const='yes' id='type-id-1516'/>
+    <qualified-type-def type-id='type-id-1144' const='yes' id='type-id-1516'/>
     <!-- const OT::Feature& -->
     <reference-type-def kind='lvalue' type-id='type-id-1516' size-in-bits='64' id='type-id-1517'/>
     <!-- const OT::Feature* -->
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-475'/>
+    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-473'/>
     <!-- const OT::FeatureParams -->
-    <qualified-type-def type-id='type-id-1149' const='yes' id='type-id-1518'/>
+    <qualified-type-def type-id='type-id-1147' const='yes' id='type-id-1518'/>
     <!-- const OT::FeatureParams& -->
     <reference-type-def kind='lvalue' type-id='type-id-1518' size-in-bits='64' id='type-id-1519'/>
     <!-- const OT::FeatureParams* -->
     <pointer-type-def type-id='type-id-1518' size-in-bits='64' id='type-id-1520'/>
     <!-- const OT::FeatureParamsCharacterVariants -->
-    <qualified-type-def type-id='type-id-1152' const='yes' id='type-id-1521'/>
+    <qualified-type-def type-id='type-id-1150' const='yes' id='type-id-1521'/>
     <!-- const OT::FeatureParamsCharacterVariants* -->
-    <pointer-type-def type-id='type-id-1521' size-in-bits='64' id='type-id-473'/>
+    <pointer-type-def type-id='type-id-1521' size-in-bits='64' id='type-id-471'/>
     <!-- const OT::FeatureParamsSize -->
-    <qualified-type-def type-id='type-id-1154' const='yes' id='type-id-1522'/>
+    <qualified-type-def type-id='type-id-1152' const='yes' id='type-id-1522'/>
     <!-- const OT::FeatureParamsSize& -->
     <reference-type-def kind='lvalue' type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
     <!-- const OT::FeatureParamsSize* -->
-    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-468'/>
     <!-- const OT::FeatureParamsStylisticSet -->
-    <qualified-type-def type-id='type-id-1156' const='yes' id='type-id-1524'/>
+    <qualified-type-def type-id='type-id-1154' const='yes' id='type-id-1524'/>
     <!-- const OT::FeatureParamsStylisticSet* -->
-    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-469'/>
     <!-- const OT::GDEF -->
-    <qualified-type-def type-id='type-id-1158' const='yes' id='type-id-1525'/>
+    <qualified-type-def type-id='type-id-1156' const='yes' id='type-id-1525'/>
     <!-- const OT::GDEF& -->
     <reference-type-def kind='lvalue' type-id='type-id-1525' size-in-bits='64' id='type-id-1526'/>
     <!-- const OT::GDEF* -->
     <pointer-type-def type-id='type-id-1525' size-in-bits='64' id='type-id-1527'/>
     <!-- const OT::GPOS -->
-    <qualified-type-def type-id='type-id-1160' const='yes' id='type-id-1528'/>
+    <qualified-type-def type-id='type-id-1158' const='yes' id='type-id-1528'/>
     <!-- const OT::GPOS& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1528' size-in-bits='64' id='type-id-946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1528' size-in-bits='64' id='type-id-944'/>
     <!-- const OT::GPOS* -->
     <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-1529'/>
     <!-- const OT::GSUB -->
-    <qualified-type-def type-id='type-id-1162' const='yes' id='type-id-1530'/>
+    <qualified-type-def type-id='type-id-1160' const='yes' id='type-id-1530'/>
     <!-- const OT::GSUB& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-940'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-938'/>
     <!-- const OT::GSUB* -->
     <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
     <!-- const OT::GSUBGPOS -->
-    <qualified-type-def type-id='type-id-1164' const='yes' id='type-id-1532'/>
+    <qualified-type-def type-id='type-id-1162' const='yes' id='type-id-1532'/>
     <!-- const OT::GSUBGPOS* -->
     <pointer-type-def type-id='type-id-1532' size-in-bits='64' id='type-id-1533'/>
     <!-- const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1166' const='yes' id='type-id-1534'/>
+    <qualified-type-def type-id='type-id-1164' const='yes' id='type-id-1534'/>
     <!-- const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1534' size-in-bits='64' id='type-id-491'/>
+    <pointer-type-def type-id='type-id-1534' size-in-bits='64' id='type-id-489'/>
     <!-- const OT::Index -->
-    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-1535'/>
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1535'/>
     <!-- const OT::Index& -->
     <reference-type-def kind='lvalue' type-id='type-id-1535' size-in-bits='64' id='type-id-1536'/>
     <!-- const OT::Index* -->
@@ -15133,405 +15122,405 @@
     <!-- const OT::IndexArray* -->
     <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
     <!-- const OT::LangSys -->
-    <qualified-type-def type-id='type-id-1169' const='yes' id='type-id-1541'/>
+    <qualified-type-def type-id='type-id-1167' const='yes' id='type-id-1541'/>
     <!-- const OT::LangSys& -->
     <reference-type-def kind='lvalue' type-id='type-id-1541' size-in-bits='64' id='type-id-1542'/>
     <!-- const OT::LangSys* -->
-    <pointer-type-def type-id='type-id-1541' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-1541' size-in-bits='64' id='type-id-460'/>
     <!-- const OT::LigCaretList -->
-    <qualified-type-def type-id='type-id-1172' const='yes' id='type-id-1543'/>
+    <qualified-type-def type-id='type-id-1170' const='yes' id='type-id-1543'/>
     <!-- const OT::LigCaretList& -->
     <reference-type-def kind='lvalue' type-id='type-id-1543' size-in-bits='64' id='type-id-1544'/>
     <!-- const OT::LigCaretList* -->
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-1545'/>
     <!-- const OT::LigGlyph -->
-    <qualified-type-def type-id='type-id-1175' const='yes' id='type-id-1546'/>
+    <qualified-type-def type-id='type-id-1173' const='yes' id='type-id-1546'/>
     <!-- const OT::LigGlyph& -->
     <reference-type-def kind='lvalue' type-id='type-id-1546' size-in-bits='64' id='type-id-1547'/>
     <!-- const OT::LigGlyph* -->
     <pointer-type-def type-id='type-id-1546' size-in-bits='64' id='type-id-1548'/>
     <!-- const OT::Ligature -->
-    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1549'/>
+    <qualified-type-def type-id='type-id-1176' const='yes' id='type-id-1549'/>
     <!-- const OT::Ligature& -->
     <reference-type-def kind='lvalue' type-id='type-id-1549' size-in-bits='64' id='type-id-1550'/>
     <!-- const OT::Ligature* -->
     <pointer-type-def type-id='type-id-1549' size-in-bits='64' id='type-id-1551'/>
     <!-- const OT::LigatureSet -->
-    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1552'/>
+    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1552'/>
     <!-- const OT::LigatureSet& -->
     <reference-type-def kind='lvalue' type-id='type-id-1552' size-in-bits='64' id='type-id-1553'/>
     <!-- const OT::LigatureSet* -->
     <pointer-type-def type-id='type-id-1552' size-in-bits='64' id='type-id-1554'/>
     <!-- const OT::LigatureSubst -->
-    <qualified-type-def type-id='type-id-1180' const='yes' id='type-id-1555'/>
+    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1555'/>
     <!-- const OT::LigatureSubst* -->
     <pointer-type-def type-id='type-id-1555' size-in-bits='64' id='type-id-1556'/>
     <!-- const OT::LigatureSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1557'/>
+    <qualified-type-def type-id='type-id-1180' const='yes' id='type-id-1557'/>
     <!-- const OT::LigatureSubstFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1557' size-in-bits='64' id='type-id-1558'/>
     <!-- const OT::LigatureSubstFormat1* -->
     <pointer-type-def type-id='type-id-1557' size-in-bits='64' id='type-id-1559'/>
     <!-- const OT::Lookup -->
-    <qualified-type-def type-id='type-id-1183' const='yes' id='type-id-1560'/>
+    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1560'/>
     <!-- const OT::Lookup& -->
     <reference-type-def kind='lvalue' type-id='type-id-1560' size-in-bits='64' id='type-id-1561'/>
     <!-- const OT::Lookup* -->
-    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-482'/>
+    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-480'/>
     <!-- const OT::LookupRecord -->
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1562'/>
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-1562'/>
     <!-- const OT::LookupRecord& -->
     <reference-type-def kind='lvalue' type-id='type-id-1562' size-in-bits='64' id='type-id-1563'/>
     <!-- const OT::LookupRecord* -->
     <pointer-type-def type-id='type-id-1562' size-in-bits='64' id='type-id-1564'/>
     <!-- const OT::MarkArray -->
-    <qualified-type-def type-id='type-id-1186' const='yes' id='type-id-1565'/>
+    <qualified-type-def type-id='type-id-1184' const='yes' id='type-id-1565'/>
     <!-- const OT::MarkArray& -->
     <reference-type-def kind='lvalue' type-id='type-id-1565' size-in-bits='64' id='type-id-1566'/>
     <!-- const OT::MarkArray* -->
     <pointer-type-def type-id='type-id-1565' size-in-bits='64' id='type-id-1567'/>
     <!-- const OT::MarkBasePos -->
-    <qualified-type-def type-id='type-id-1189' const='yes' id='type-id-1568'/>
+    <qualified-type-def type-id='type-id-1187' const='yes' id='type-id-1568'/>
     <!-- const OT::MarkBasePos* -->
     <pointer-type-def type-id='type-id-1568' size-in-bits='64' id='type-id-1569'/>
     <!-- const OT::MarkBasePosFormat1 -->
-    <qualified-type-def type-id='type-id-1191' const='yes' id='type-id-1570'/>
+    <qualified-type-def type-id='type-id-1189' const='yes' id='type-id-1570'/>
     <!-- const OT::MarkBasePosFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1570' size-in-bits='64' id='type-id-1571'/>
     <!-- const OT::MarkBasePosFormat1* -->
-    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-524'/>
+    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-522'/>
     <!-- const OT::MarkGlyphSets -->
-    <qualified-type-def type-id='type-id-1193' const='yes' id='type-id-1572'/>
+    <qualified-type-def type-id='type-id-1191' const='yes' id='type-id-1572'/>
     <!-- const OT::MarkGlyphSets& -->
     <reference-type-def kind='lvalue' type-id='type-id-1572' size-in-bits='64' id='type-id-1573'/>
     <!-- const OT::MarkGlyphSets* -->
     <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-1574'/>
     <!-- const OT::MarkGlyphSetsFormat1 -->
-    <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-1575'/>
+    <qualified-type-def type-id='type-id-1194' const='yes' id='type-id-1575'/>
     <!-- const OT::MarkGlyphSetsFormat1* -->
     <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-1576'/>
     <!-- const OT::MarkLigPos -->
-    <qualified-type-def type-id='type-id-1198' const='yes' id='type-id-1577'/>
+    <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-1577'/>
     <!-- const OT::MarkLigPos* -->
     <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
     <!-- const OT::MarkLigPosFormat1 -->
-    <qualified-type-def type-id='type-id-1200' const='yes' id='type-id-1579'/>
+    <qualified-type-def type-id='type-id-1198' const='yes' id='type-id-1579'/>
     <!-- const OT::MarkLigPosFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1579' size-in-bits='64' id='type-id-1580'/>
     <!-- const OT::MarkLigPosFormat1* -->
-    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-527'/>
+    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-525'/>
     <!-- const OT::MarkMarkPos -->
-    <qualified-type-def type-id='type-id-1202' const='yes' id='type-id-1581'/>
+    <qualified-type-def type-id='type-id-1200' const='yes' id='type-id-1581'/>
     <!-- const OT::MarkMarkPos* -->
     <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-1582'/>
     <!-- const OT::MarkMarkPosFormat1 -->
-    <qualified-type-def type-id='type-id-1204' const='yes' id='type-id-1583'/>
+    <qualified-type-def type-id='type-id-1202' const='yes' id='type-id-1583'/>
     <!-- const OT::MarkMarkPosFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
     <!-- const OT::MarkMarkPosFormat1* -->
-    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-528'/>
+    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-526'/>
     <!-- const OT::MarkRecord -->
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1585'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1585'/>
     <!-- const OT::MarkRecord& -->
     <reference-type-def kind='lvalue' type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
     <!-- const OT::MarkRecord* -->
-    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-520'/>
+    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-518'/>
     <!-- const OT::MultipleSubst -->
-    <qualified-type-def type-id='type-id-1208' const='yes' id='type-id-1587'/>
+    <qualified-type-def type-id='type-id-1206' const='yes' id='type-id-1587'/>
     <!-- const OT::MultipleSubst* -->
     <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
     <!-- const OT::MultipleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1210' const='yes' id='type-id-1589'/>
+    <qualified-type-def type-id='type-id-1208' const='yes' id='type-id-1589'/>
     <!-- const OT::MultipleSubstFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
     <!-- const OT::MultipleSubstFormat1* -->
     <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-1591'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1592'/>
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1592'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1592' size-in-bits='64' id='type-id-1593'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-1592' size-in-bits='64' id='type-id-1594'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix> -->
-    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1595'/>
+    <qualified-type-def type-id='type-id-1211' const='yes' id='type-id-1595'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1595' size-in-bits='64' id='type-id-1596'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix>* -->
     <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-1597'/>
     <!-- const OT::OffsetListOf<OT::Lookup> -->
-    <qualified-type-def type-id='type-id-1216' const='yes' id='type-id-1598'/>
+    <qualified-type-def type-id='type-id-1214' const='yes' id='type-id-1598'/>
     <!-- const OT::OffsetListOf<OT::Lookup>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1598' size-in-bits='64' id='type-id-1599'/>
     <!-- const OT::OffsetListOf<OT::Lookup>* -->
     <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-1600'/>
     <!-- const OT::OffsetListOf<OT::PosLookup> -->
-    <qualified-type-def type-id='type-id-1219' const='yes' id='type-id-1601'/>
+    <qualified-type-def type-id='type-id-1217' const='yes' id='type-id-1601'/>
     <!-- const OT::OffsetListOf<OT::PosLookup>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1601' size-in-bits='64' id='type-id-1602'/>
     <!-- const OT::OffsetListOf<OT::PosLookup>* -->
     <pointer-type-def type-id='type-id-1601' size-in-bits='64' id='type-id-1603'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup> -->
-    <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1604'/>
+    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1604'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup>* -->
     <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1606'/>
     <!-- const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1607'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1607'/>
     <!-- const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1607' size-in-bits='64' id='type-id-518'/>
+    <pointer-type-def type-id='type-id-1607' size-in-bits='64' id='type-id-516'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1608'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1608'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1608' size-in-bits='64' id='type-id-1609'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-521'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1610'/>
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1610'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-443'/>
+    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-441'/>
     <!-- const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1227' const='yes' id='type-id-1612'/>
+    <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1612'/>
     <!-- const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-444'/>
+    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-442'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1613'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1613'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1613' size-in-bits='64' id='type-id-1614'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1613' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-1613' size-in-bits='64' id='type-id-450'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1615'/>
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1615'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1615' size-in-bits='64' id='type-id-1616'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1615' size-in-bits='64' id='type-id-502'/>
+    <pointer-type-def type-id='type-id-1615' size-in-bits='64' id='type-id-500'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1617'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1617'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1617' size-in-bits='64' id='type-id-1618'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1617' size-in-bits='64' id='type-id-503'/>
+    <pointer-type-def type-id='type-id-1617' size-in-bits='64' id='type-id-501'/>
     <!-- const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1231' const='yes' id='type-id-1619'/>
+    <qualified-type-def type-id='type-id-1229' const='yes' id='type-id-1619'/>
     <!-- const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1619' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-1619' size-in-bits='64' id='type-id-454'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1620'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1620'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1620' size-in-bits='64' id='type-id-1621'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1620' size-in-bits='64' id='type-id-441'/>
+    <pointer-type-def type-id='type-id-1620' size-in-bits='64' id='type-id-439'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1622'/>
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1622'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1622' size-in-bits='64' id='type-id-1623'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-456'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1624'/>
+    <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1624'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1624' size-in-bits='64' id='type-id-1625'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-450'/>
+    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-448'/>
     <!-- const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1626'/>
+    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1626'/>
     <!-- const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-475'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1627'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1627'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1627' size-in-bits='64' id='type-id-476'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1627' size-in-bits='64' id='type-id-474'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-472'/>
     <!-- const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1628'/>
+    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1628'/>
     <!-- const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-463'/>
+    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-461'/>
     <!-- const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1239' const='yes' id='type-id-1629'/>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1629'/>
     <!-- const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-452'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1630'/>
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1630'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-1631'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-451'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1632'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1632'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1632' size-in-bits='64' id='type-id-1633'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-492'/>
+    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-490'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1634'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1634'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1634' size-in-bits='64' id='type-id-1635'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1634' size-in-bits='64' id='type-id-493'/>
+    <pointer-type-def type-id='type-id-1634' size-in-bits='64' id='type-id-491'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1636'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1636'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1636' size-in-bits='64' id='type-id-1637'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-481'/>
     <!-- const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1638'/>
+    <qualified-type-def type-id='type-id-1242' const='yes' id='type-id-1638'/>
     <!-- const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-521'/>
+    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-519'/>
     <!-- const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1639'/>
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1639'/>
     <!-- const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-457'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1640'/>
+    <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1640'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-526'/>
+    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-524'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1641'/>
+    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1641'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-482'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1642'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1642'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-535'/>
+    <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-533'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1248' const='yes' id='type-id-1643'/>
+    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1643'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-506'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1644'/>
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1644'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1644' size-in-bits='64' id='type-id-1645'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1644' size-in-bits='64' id='type-id-513'/>
+    <pointer-type-def type-id='type-id-1644' size-in-bits='64' id='type-id-511'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1646'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1646'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1646' size-in-bits='64' id='type-id-1647'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-534'/>
+    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-532'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1648'/>
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1648'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1648' size-in-bits='64' id='type-id-1649'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-533'/>
+    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-531'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1650'/>
+    <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-1650'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-477'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1253' const='yes' id='type-id-1651'/>
+    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1651'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-466'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1652'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1652'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1652' size-in-bits='64' id='type-id-1653'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1652' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-1652' size-in-bits='64' id='type-id-494'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1654'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1654'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-497'/>
+    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-495'/>
     <!-- const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1256' const='yes' id='type-id-1656'/>
+    <qualified-type-def type-id='type-id-1254' const='yes' id='type-id-1656'/>
     <!-- const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-466'/>
+    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-464'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1657'/>
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1657'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-488'/>
+    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-486'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1659'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1659'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1659' size-in-bits='64' id='type-id-1660'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-507'/>
+    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-505'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1661'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1661'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1661' size-in-bits='64' id='type-id-1662'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1661' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-1661' size-in-bits='64' id='type-id-504'/>
     <!-- const OT::PairPos -->
-    <qualified-type-def type-id='type-id-1260' const='yes' id='type-id-1663'/>
+    <qualified-type-def type-id='type-id-1258' const='yes' id='type-id-1663'/>
     <!-- const OT::PairPos* -->
     <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1664'/>
     <!-- const OT::PairPosFormat1 -->
-    <qualified-type-def type-id='type-id-1262' const='yes' id='type-id-1665'/>
+    <qualified-type-def type-id='type-id-1260' const='yes' id='type-id-1665'/>
     <!-- const OT::PairPosFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1665' size-in-bits='64' id='type-id-1666'/>
     <!-- const OT::PairPosFormat1* -->
-    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-531'/>
+    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-529'/>
     <!-- const OT::PairPosFormat2 -->
-    <qualified-type-def type-id='type-id-1264' const='yes' id='type-id-1667'/>
+    <qualified-type-def type-id='type-id-1262' const='yes' id='type-id-1667'/>
     <!-- const OT::PairPosFormat2& -->
     <reference-type-def kind='lvalue' type-id='type-id-1667' size-in-bits='64' id='type-id-1668'/>
     <!-- const OT::PairPosFormat2* -->
-    <pointer-type-def type-id='type-id-1667' size-in-bits='64' id='type-id-532'/>
+    <pointer-type-def type-id='type-id-1667' size-in-bits='64' id='type-id-530'/>
     <!-- const OT::PairSet -->
-    <qualified-type-def type-id='type-id-1266' const='yes' id='type-id-1669'/>
+    <qualified-type-def type-id='type-id-1264' const='yes' id='type-id-1669'/>
     <!-- const OT::PairSet& -->
     <reference-type-def kind='lvalue' type-id='type-id-1669' size-in-bits='64' id='type-id-1670'/>
     <!-- const OT::PairSet* -->
-    <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-510'/>
     <!-- const OT::PairSet::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-1269' const='yes' id='type-id-1671'/>
+    <qualified-type-def type-id='type-id-1267' const='yes' id='type-id-1671'/>
     <!-- const OT::PairSet::sanitize_closure_t* -->
     <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-1672'/>
     <!-- const OT::PosLookup -->
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-1673'/>
+    <qualified-type-def type-id='type-id-943' const='yes' id='type-id-1673'/>
     <!-- const OT::PosLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1673' size-in-bits='64' id='type-id-934'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1673' size-in-bits='64' id='type-id-932'/>
     <!-- const OT::PosLookup* -->
     <pointer-type-def type-id='type-id-1673' size-in-bits='64' id='type-id-1674'/>
     <!-- const OT::PosLookupSubTable -->
-    <qualified-type-def type-id='type-id-1273' const='yes' id='type-id-1675'/>
+    <qualified-type-def type-id='type-id-1271' const='yes' id='type-id-1675'/>
     <!-- const OT::PosLookupSubTable& -->
     <reference-type-def kind='lvalue' type-id='type-id-1675' size-in-bits='64' id='type-id-1676'/>
     <!-- const OT::PosLookupSubTable* -->
     <pointer-type-def type-id='type-id-1675' size-in-bits='64' id='type-id-1677'/>
     <!-- const OT::RangeRecord -->
-    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1678'/>
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1678'/>
     <!-- const OT::RangeRecord& -->
     <reference-type-def kind='lvalue' type-id='type-id-1678' size-in-bits='64' id='type-id-1679'/>
     <!-- const OT::RangeRecord* -->
     <pointer-type-def type-id='type-id-1678' size-in-bits='64' id='type-id-1680'/>
     <!-- const OT::Record<OT::Feature> -->
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1681'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1681'/>
     <!-- const OT::Record<OT::Feature>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1681' size-in-bits='64' id='type-id-1682'/>
     <!-- const OT::Record<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-1681' size-in-bits='64' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-1681' size-in-bits='64' id='type-id-476'/>
     <!-- const OT::Record<OT::Feature>::sanitize_closure_t -->
     <qualified-type-def type-id='type-id-1683' const='yes' id='type-id-1684'/>
     <!-- const OT::Record<OT::Feature>::sanitize_closure_t* -->
     <pointer-type-def type-id='type-id-1684' size-in-bits='64' id='type-id-1685'/>
     <!-- const OT::Record<OT::LangSys> -->
-    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1686'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1686'/>
     <!-- const OT::Record<OT::LangSys>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
     <!-- const OT::Record<OT::LangSys>* -->
-    <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-463'/>
     <!-- const OT::Record<OT::LangSys>::sanitize_closure_t -->
     <qualified-type-def type-id='type-id-1688' const='yes' id='type-id-1689'/>
     <!-- const OT::Record<OT::LangSys>::sanitize_closure_t* -->
     <pointer-type-def type-id='type-id-1689' size-in-bits='64' id='type-id-1690'/>
     <!-- const OT::Record<OT::Script> -->
-    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1691'/>
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1691'/>
     <!-- const OT::Record<OT::Script>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1691' size-in-bits='64' id='type-id-1692'/>
     <!-- const OT::Record<OT::Script>* -->
-    <pointer-type-def type-id='type-id-1691' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-1691' size-in-bits='64' id='type-id-465'/>
     <!-- const OT::Record<OT::Script>::sanitize_closure_t -->
     <qualified-type-def type-id='type-id-1693' const='yes' id='type-id-1694'/>
     <!-- const OT::Record<OT::Script>::sanitize_closure_t* -->
@@ -15549,83 +15538,83 @@
     <!-- const OT::RecordArrayOf<OT::Script>* -->
     <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
     <!-- const OT::RecordListOf<OT::Feature> -->
-    <qualified-type-def type-id='type-id-1284' const='yes' id='type-id-1705'/>
+    <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1705'/>
     <!-- const OT::RecordListOf<OT::Feature>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1705' size-in-bits='64' id='type-id-1706'/>
     <!-- const OT::RecordListOf<OT::Feature>* -->
     <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1707'/>
     <!-- const OT::RecordListOf<OT::Script> -->
-    <qualified-type-def type-id='type-id-1287' const='yes' id='type-id-1708'/>
+    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1708'/>
     <!-- const OT::RecordListOf<OT::Script>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1708' size-in-bits='64' id='type-id-1709'/>
     <!-- const OT::RecordListOf<OT::Script>* -->
     <pointer-type-def type-id='type-id-1708' size-in-bits='64' id='type-id-1710'/>
     <!-- const OT::ReverseChainSingleSubst -->
-    <qualified-type-def type-id='type-id-1290' const='yes' id='type-id-1711'/>
+    <qualified-type-def type-id='type-id-1288' const='yes' id='type-id-1711'/>
     <!-- const OT::ReverseChainSingleSubst* -->
     <pointer-type-def type-id='type-id-1711' size-in-bits='64' id='type-id-1712'/>
     <!-- const OT::ReverseChainSingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1292' const='yes' id='type-id-1713'/>
+    <qualified-type-def type-id='type-id-1290' const='yes' id='type-id-1713'/>
     <!-- const OT::ReverseChainSingleSubstFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1713' size-in-bits='64' id='type-id-1714'/>
     <!-- const OT::ReverseChainSingleSubstFormat1* -->
     <pointer-type-def type-id='type-id-1713' size-in-bits='64' id='type-id-1715'/>
     <!-- const OT::Rule -->
-    <qualified-type-def type-id='type-id-1294' const='yes' id='type-id-1716'/>
+    <qualified-type-def type-id='type-id-1292' const='yes' id='type-id-1716'/>
     <!-- const OT::Rule& -->
     <reference-type-def kind='lvalue' type-id='type-id-1716' size-in-bits='64' id='type-id-1717'/>
     <!-- const OT::Rule* -->
     <pointer-type-def type-id='type-id-1716' size-in-bits='64' id='type-id-1718'/>
     <!-- const OT::RuleSet -->
-    <qualified-type-def type-id='type-id-1297' const='yes' id='type-id-1719'/>
+    <qualified-type-def type-id='type-id-1295' const='yes' id='type-id-1719'/>
     <!-- const OT::RuleSet& -->
     <reference-type-def kind='lvalue' type-id='type-id-1719' size-in-bits='64' id='type-id-1720'/>
     <!-- const OT::RuleSet* -->
     <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-1721'/>
     <!-- const OT::SHORT -->
-    <qualified-type-def type-id='type-id-575' const='yes' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1722'/>
     <!-- const OT::SHORT& -->
     <reference-type-def kind='lvalue' type-id='type-id-1722' size-in-bits='64' id='type-id-1723'/>
     <!-- const OT::Script -->
-    <qualified-type-def type-id='type-id-1300' const='yes' id='type-id-1724'/>
+    <qualified-type-def type-id='type-id-1298' const='yes' id='type-id-1724'/>
     <!-- const OT::Script& -->
     <reference-type-def kind='lvalue' type-id='type-id-1724' size-in-bits='64' id='type-id-1725'/>
     <!-- const OT::Script* -->
     <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-1726'/>
     <!-- const OT::Sequence -->
-    <qualified-type-def type-id='type-id-1303' const='yes' id='type-id-1727'/>
+    <qualified-type-def type-id='type-id-1301' const='yes' id='type-id-1727'/>
     <!-- const OT::Sequence& -->
     <reference-type-def kind='lvalue' type-id='type-id-1727' size-in-bits='64' id='type-id-1728'/>
     <!-- const OT::Sequence* -->
     <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1729'/>
     <!-- const OT::SinglePos -->
-    <qualified-type-def type-id='type-id-1306' const='yes' id='type-id-1730'/>
+    <qualified-type-def type-id='type-id-1304' const='yes' id='type-id-1730'/>
     <!-- const OT::SinglePos* -->
     <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-1731'/>
     <!-- const OT::SinglePosFormat1 -->
-    <qualified-type-def type-id='type-id-1308' const='yes' id='type-id-1732'/>
+    <qualified-type-def type-id='type-id-1306' const='yes' id='type-id-1732'/>
     <!-- const OT::SinglePosFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1732' size-in-bits='64' id='type-id-1733'/>
     <!-- const OT::SinglePosFormat1* -->
-    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-527'/>
     <!-- const OT::SinglePosFormat2 -->
-    <qualified-type-def type-id='type-id-1310' const='yes' id='type-id-1734'/>
+    <qualified-type-def type-id='type-id-1308' const='yes' id='type-id-1734'/>
     <!-- const OT::SinglePosFormat2& -->
     <reference-type-def kind='lvalue' type-id='type-id-1734' size-in-bits='64' id='type-id-1735'/>
     <!-- const OT::SinglePosFormat2* -->
-    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-530'/>
+    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-528'/>
     <!-- const OT::SingleSubst -->
-    <qualified-type-def type-id='type-id-1312' const='yes' id='type-id-1736'/>
+    <qualified-type-def type-id='type-id-1310' const='yes' id='type-id-1736'/>
     <!-- const OT::SingleSubst* -->
     <pointer-type-def type-id='type-id-1736' size-in-bits='64' id='type-id-1737'/>
     <!-- const OT::SingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1738'/>
+    <qualified-type-def type-id='type-id-1312' const='yes' id='type-id-1738'/>
     <!-- const OT::SingleSubstFormat1& -->
     <reference-type-def kind='lvalue' type-id='type-id-1738' size-in-bits='64' id='type-id-1739'/>
     <!-- const OT::SingleSubstFormat1* -->
     <pointer-type-def type-id='type-id-1738' size-in-bits='64' id='type-id-1740'/>
     <!-- const OT::SingleSubstFormat2 -->
-    <qualified-type-def type-id='type-id-1315' const='yes' id='type-id-1741'/>
+    <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1741'/>
     <!-- const OT::SingleSubstFormat2& -->
     <reference-type-def kind='lvalue' type-id='type-id-1741' size-in-bits='64' id='type-id-1742'/>
     <!-- const OT::SingleSubstFormat2* -->
@@ -15647,200 +15636,198 @@
     <!-- const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1755'/>
     <!-- const OT::SubstLookup -->
-    <qualified-type-def type-id='type-id-938' const='yes' id='type-id-1756'/>
+    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1756'/>
     <!-- const OT::SubstLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1756' size-in-bits='64' id='type-id-933'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1756' size-in-bits='64' id='type-id-931'/>
     <!-- const OT::SubstLookup* -->
     <pointer-type-def type-id='type-id-1756' size-in-bits='64' id='type-id-1757'/>
     <!-- const OT::SubstLookupSubTable -->
-    <qualified-type-def type-id='type-id-1317' const='yes' id='type-id-1758'/>
+    <qualified-type-def type-id='type-id-1315' const='yes' id='type-id-1758'/>
     <!-- const OT::SubstLookupSubTable& -->
     <reference-type-def kind='lvalue' type-id='type-id-1758' size-in-bits='64' id='type-id-1759'/>
     <!-- const OT::SubstLookupSubTable* -->
     <pointer-type-def type-id='type-id-1758' size-in-bits='64' id='type-id-1760'/>
     <!-- const OT::Tag& -->
-    <reference-type-def kind='lvalue' type-id='type-id-322' size-in-bits='64' id='type-id-1761'/>
+    <reference-type-def kind='lvalue' type-id='type-id-320' size-in-bits='64' id='type-id-1761'/>
     <!-- const OT::USHORT -->
-    <qualified-type-def type-id='type-id-373' const='yes' id='type-id-1762'/>
+    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-1762'/>
     <!-- const OT::USHORT& -->
     <reference-type-def kind='lvalue' type-id='type-id-1762' size-in-bits='64' id='type-id-1763'/>
     <!-- const OT::USHORT* -->
     <pointer-type-def type-id='type-id-1762' size-in-bits='64' id='type-id-1764'/>
     <!-- const OT::Value -->
-    <qualified-type-def type-id='type-id-914' const='yes' id='type-id-1765'/>
+    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1765'/>
     <!-- const OT::Value* -->
     <pointer-type-def type-id='type-id-1765' size-in-bits='64' id='type-id-1766'/>
     <!-- const OT::ValueFormat -->
-    <qualified-type-def type-id='type-id-1380' const='yes' id='type-id-1767'/>
+    <qualified-type-def type-id='type-id-1378' const='yes' id='type-id-1767'/>
     <!-- const OT::ValueFormat* -->
     <pointer-type-def type-id='type-id-1767' size-in-bits='64' id='type-id-1768'/>
     <!-- const OT::hb_apply_context_t -->
-    <qualified-type-def type-id='type-id-1382' const='yes' id='type-id-1769'/>
+    <qualified-type-def type-id='type-id-1380' const='yes' id='type-id-1769'/>
     <!-- const OT::hb_apply_context_t* -->
     <pointer-type-def type-id='type-id-1769' size-in-bits='64' id='type-id-1770'/>
     <!-- const OT::hb_apply_context_t::matcher_t -->
-    <qualified-type-def type-id='type-id-1384' const='yes' id='type-id-1771'/>
+    <qualified-type-def type-id='type-id-1382' const='yes' id='type-id-1771'/>
     <!-- const OT::hb_apply_context_t::matcher_t* -->
     <pointer-type-def type-id='type-id-1771' size-in-bits='64' id='type-id-1772'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t -->
-    <qualified-type-def type-id='type-id-1386' const='yes' id='type-id-1773'/>
+    <qualified-type-def type-id='type-id-1384' const='yes' id='type-id-1773'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t* -->
     <pointer-type-def type-id='type-id-1773' size-in-bits='64' id='type-id-1774'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t -->
-    <qualified-type-def type-id='type-id-1388' const='yes' id='type-id-1775'/>
+    <qualified-type-def type-id='type-id-1386' const='yes' id='type-id-1775'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t* -->
     <pointer-type-def type-id='type-id-1775' size-in-bits='64' id='type-id-1776'/>
     <!-- const OT::hb_closure_context_t -->
-    <qualified-type-def type-id='type-id-1390' const='yes' id='type-id-1777'/>
+    <qualified-type-def type-id='type-id-1388' const='yes' id='type-id-1777'/>
     <!-- const OT::hb_closure_context_t* -->
     <pointer-type-def type-id='type-id-1777' size-in-bits='64' id='type-id-1778'/>
     <!-- const OT::hb_collect_glyphs_context_t -->
-    <qualified-type-def type-id='type-id-1392' const='yes' id='type-id-1779'/>
+    <qualified-type-def type-id='type-id-1390' const='yes' id='type-id-1779'/>
     <!-- const OT::hb_collect_glyphs_context_t* -->
     <pointer-type-def type-id='type-id-1779' size-in-bits='64' id='type-id-1780'/>
     <!-- const OT::hb_would_apply_context_t -->
-    <qualified-type-def type-id='type-id-1396' const='yes' id='type-id-1781'/>
+    <qualified-type-def type-id='type-id-1394' const='yes' id='type-id-1781'/>
     <!-- const OT::hb_would_apply_context_t* -->
     <pointer-type-def type-id='type-id-1781' size-in-bits='64' id='type-id-1782'/>
     <!-- const _hb_void_t -->
-    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1783'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1783'/>
     <!-- const _hb_void_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1783' size-in-bits='64' id='type-id-982'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1783' size-in-bits='64' id='type-id-980'/>
+    <!-- typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* -->
+    <pointer-type-def type-id='type-id-1784' size-in-bits='64' id='type-id-1785'/>
+    <!-- typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* -->
+    <pointer-type-def type-id='type-id-1786' size-in-bits='64' id='type-id-1787'/>
     <!-- const bool -->
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-939'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-937'/>
     <!-- const hb_glyph_info_t* -->
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-1784'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-1788'/>
     <!-- const hb_ot_layout_lookup_accelerator_t -->
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1785'/>
+    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-1789'/>
     <!-- const hb_ot_layout_lookup_accelerator_t* -->
-    <pointer-type-def type-id='type-id-1785' size-in-bits='64' id='type-id-941'/>
+    <pointer-type-def type-id='type-id-1789' size-in-bits='64' id='type-id-939'/>
     <!-- const hb_ot_map_t -->
-    <qualified-type-def type-id='type-id-949' const='yes' id='type-id-1786'/>
+    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1790'/>
     <!-- const hb_ot_map_t* -->
-    <pointer-type-def type-id='type-id-1786' size-in-bits='64' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-1790' size-in-bits='64' id='type-id-954'/>
     <!-- const hb_ot_map_t::feature_map_t -->
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-1787'/>
+    <qualified-type-def type-id='type-id-915' const='yes' id='type-id-1791'/>
     <!-- const hb_ot_map_t::feature_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1787' size-in-bits='64' id='type-id-1788'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1791' size-in-bits='64' id='type-id-1792'/>
     <!-- const hb_ot_map_t::feature_map_t* -->
-    <pointer-type-def type-id='type-id-1787' size-in-bits='64' id='type-id-950'/>
+    <pointer-type-def type-id='type-id-1791' size-in-bits='64' id='type-id-948'/>
     <!-- const hb_ot_map_t::lookup_map_t -->
-    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-1789'/>
+    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-1793'/>
     <!-- const hb_ot_map_t::lookup_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1789' size-in-bits='64' id='type-id-970'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1793' size-in-bits='64' id='type-id-968'/>
     <!-- const hb_ot_map_t::lookup_map_t* -->
-    <pointer-type-def type-id='type-id-1789' size-in-bits='64' id='type-id-951'/>
+    <pointer-type-def type-id='type-id-1793' size-in-bits='64' id='type-id-949'/>
     <!-- const hb_ot_map_t::lookup_map_t** -->
-    <pointer-type-def type-id='type-id-951' size-in-bits='64' id='type-id-961'/>
+    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-959'/>
     <!-- const hb_ot_map_t::stage_map_t -->
-    <qualified-type-def type-id='type-id-922' const='yes' id='type-id-1790'/>
+    <qualified-type-def type-id='type-id-920' const='yes' id='type-id-1794'/>
     <!-- const hb_ot_map_t::stage_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1790' size-in-bits='64' id='type-id-975'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1794' size-in-bits='64' id='type-id-973'/>
     <!-- const hb_ot_shape_plan_t -->
-    <qualified-type-def type-id='type-id-1791' const='yes' id='type-id-1792'/>
+    <qualified-type-def type-id='type-id-1795' const='yes' id='type-id-1796'/>
     <!-- const hb_ot_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-1792' size-in-bits='64' id='type-id-958'/>
+    <pointer-type-def type-id='type-id-1796' size-in-bits='64' id='type-id-956'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u> -->
-    <qualified-type-def type-id='type-id-954' const='yes' id='type-id-1793'/>
+    <qualified-type-def type-id='type-id-952' const='yes' id='type-id-1797'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>* -->
-    <pointer-type-def type-id='type-id-1793' size-in-bits='64' id='type-id-966'/>
+    <pointer-type-def type-id='type-id-1797' size-in-bits='64' id='type-id-964'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u> -->
-    <qualified-type-def type-id='type-id-924' const='yes' id='type-id-1794'/>
+    <qualified-type-def type-id='type-id-922' const='yes' id='type-id-1798'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>* -->
-    <pointer-type-def type-id='type-id-1794' size-in-bits='64' id='type-id-969'/>
+    <pointer-type-def type-id='type-id-1798' size-in-bits='64' id='type-id-967'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u> -->
-    <qualified-type-def type-id='type-id-926' const='yes' id='type-id-1795'/>
+    <qualified-type-def type-id='type-id-924' const='yes' id='type-id-1799'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>* -->
-    <pointer-type-def type-id='type-id-1795' size-in-bits='64' id='type-id-974'/>
+    <pointer-type-def type-id='type-id-1799' size-in-bits='64' id='type-id-972'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > -->
-    <qualified-type-def type-id='type-id-992' const='yes' id='type-id-1796'/>
+    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-1800'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >* -->
-    <pointer-type-def type-id='type-id-1796' size-in-bits='64' id='type-id-993'/>
+    <pointer-type-def type-id='type-id-1800' size-in-bits='64' id='type-id-991'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > > -->
-    <qualified-type-def type-id='type-id-995' const='yes' id='type-id-1797'/>
+    <qualified-type-def type-id='type-id-993' const='yes' id='type-id-1801'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >* -->
-    <pointer-type-def type-id='type-id-1797' size-in-bits='64' id='type-id-997'/>
+    <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-995'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u> -->
-    <qualified-type-def type-id='type-id-983' const='yes' id='type-id-1798'/>
+    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1802'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u>* -->
-    <pointer-type-def type-id='type-id-1798' size-in-bits='64' id='type-id-984'/>
+    <pointer-type-def type-id='type-id-1802' size-in-bits='64' id='type-id-982'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u> -->
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-1799'/>
+    <qualified-type-def type-id='type-id-984' const='yes' id='type-id-1803'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u>* -->
-    <pointer-type-def type-id='type-id-1799' size-in-bits='64' id='type-id-987'/>
+    <pointer-type-def type-id='type-id-1803' size-in-bits='64' id='type-id-985'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u> -->
-    <qualified-type-def type-id='type-id-989' const='yes' id='type-id-1800'/>
+    <qualified-type-def type-id='type-id-987' const='yes' id='type-id-1804'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u>* -->
-    <pointer-type-def type-id='type-id-1800' size-in-bits='64' id='type-id-990'/>
+    <pointer-type-def type-id='type-id-1804' size-in-bits='64' id='type-id-988'/>
     <!-- const hb_set_digest_t -->
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1801'/>
+    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-1805'/>
     <!-- const hb_set_digest_t* -->
-    <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-1802'/>
+    <pointer-type-def type-id='type-id-1805' size-in-bits='64' id='type-id-1806'/>
     <!-- const hb_tag_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-343' size-in-bits='64' id='type-id-1803'/>
+    <reference-type-def kind='lvalue' type-id='type-id-341' size-in-bits='64' id='type-id-1807'/>
     <!-- const hb_tag_t* -->
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-1804'/>
+    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-1808'/>
     <!-- hb_auto_trace_t<0, const OT::Coverage&>* -->
-    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
+    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
     <!-- hb_auto_trace_t<0, const _hb_void_t&>* -->
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
     <!-- hb_ot_layout_lookup_accelerator_t* -->
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-930'/>
     <!-- hb_ot_map_t* -->
-    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-955'/>
+    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-953'/>
     <!-- hb_ot_map_t::feature_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-965'/>
+    <reference-type-def kind='lvalue' type-id='type-id-915' size-in-bits='64' id='type-id-963'/>
     <!-- hb_ot_map_t::feature_map_t* -->
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-961'/>
     <!-- hb_ot_map_t::lookup_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-919' size-in-bits='64' id='type-id-972'/>
+    <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-970'/>
     <!-- hb_ot_map_t::lookup_map_t* -->
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-968'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-966'/>
     <!-- hb_ot_map_t::stage_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-922' size-in-bits='64' id='type-id-1805'/>
+    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-1809'/>
     <!-- hb_ot_map_t::stage_map_t* -->
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-973'/>
+    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-971'/>
     <!-- hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>* -->
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-964'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-962'/>
     <!-- hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>* -->
-    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-971'/>
+    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-969'/>
     <!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>* -->
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-974'/>
     <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >* -->
-    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-994'/>
+    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-992'/>
     <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >* -->
-    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-996'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-994'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 0u>* -->
-    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-985'/>
+    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-983'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 4u>* -->
-    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-988'/>
+    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-986'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 9u>* -->
-    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-989'/>
     <!-- hb_set_digest_t* -->
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-1806'/>
-    <!-- typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1807' size-in-bits='64' id='type-id-1808'/>
-    <!-- typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1809' size-in-bits='64' id='type-id-1810'/>
-    <!-- typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1811' size-in-bits='64' id='type-id-1812'/>
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-1810'/>
     <!-- void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* -->
-    <pointer-type-def type-id='type-id-1813' size-in-bits='64' id='type-id-953'/>
+    <pointer-type-def type-id='type-id-1811' size-in-bits='64' id='type-id-951'/>
     <!-- void (hb_set_t*, const OT::USHORT&, void*)* -->
-    <pointer-type-def type-id='type-id-1814' size-in-bits='64' id='type-id-1815'/>
+    <pointer-type-def type-id='type-id-1812' size-in-bits='64' id='type-id-1813'/>
     <!-- struct hb_ot_shape_plan_t -->
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1791'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1795'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_segment_properties_t hb_ot_shape_plan_t::props -->
         <var-decl name='props' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const hb_ot_complex_shaper_t* hb_ot_shape_plan_t::shaper -->
-        <var-decl name='shaper' type-id='type-id-1816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
+        <var-decl name='shaper' type-id='type-id-1814' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- hb_ot_map_t hb_ot_shape_plan_t::map -->
-        <var-decl name='map' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='41' column='1'/>
+        <var-decl name='map' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
         <!-- void* hb_ot_shape_plan_t::data -->
@@ -15882,11 +15869,11 @@
         <!-- void hb_ot_shape_plan_t::collect_lookups(hb_tag_t, hb_set_t*) -->
         <function-decl name='collect_lookups' mangled-name='_ZNK18hb_ot_shape_plan_t15collect_lookupsEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-960'/>
+          <parameter type-id='type-id-958'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -15895,7 +15882,7 @@
         <!-- void hb_ot_shape_plan_t::substitute(hb_font_t*, hb_buffer_t*) -->
         <function-decl name='substitute' mangled-name='_ZNK18hb_ot_shape_plan_t10substituteEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_buffer_t*' -->
@@ -15908,7 +15895,7 @@
         <!-- void hb_ot_shape_plan_t::position(hb_font_t*, hb_buffer_t*) -->
         <function-decl name='position' mangled-name='_ZNK18hb_ot_shape_plan_t8positionEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_buffer_t*' -->
@@ -15921,7 +15908,7 @@
         <!-- void hb_ot_shape_plan_t::finish() -->
         <function-decl name='finish' mangled-name='_ZN18hb_ot_shape_plan_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-1817' is-artificial='yes'/>
+          <parameter type-id='type-id-1815' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -15930,15 +15917,15 @@
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1818'/>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1816'/>
       <!-- struct OT::BEInt<short int, 2> -->
-      <class-decl name='BEInt&lt;short int, 2&gt;' is-struct='yes' visibility='default' id='type-id-1819'/>
+      <class-decl name='BEInt&lt;short int, 2&gt;' is-struct='yes' visibility='default' id='type-id-1817'/>
       <!-- struct OT::IntType<unsigned int, 3u> -->
-      <class-decl name='IntType&lt;unsigned int, 3u&gt;' is-struct='yes' visibility='default' id='type-id-1820'/>
+      <class-decl name='IntType&lt;unsigned int, 3u&gt;' is-struct='yes' visibility='default' id='type-id-1818'/>
       <!-- struct OT::Tag -->
-      <class-decl name='Tag' is-struct='yes' visibility='default' id='type-id-1821'/>
+      <class-decl name='Tag' is-struct='yes' visibility='default' id='type-id-1819'/>
       <!-- struct OT::Sanitizer<OT::GDEF> -->
-      <class-decl name='Sanitizer&lt;OT::GDEF&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1822'>
+      <class-decl name='Sanitizer&lt;OT::GDEF&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1820'>
         <member-function access='public' static='yes'>
           <!-- hb_blob_t* OT::Sanitizer<OT::GDEF>::sanitize() -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4GDEFEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -15959,7 +15946,7 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Sanitizer<OT::GPOS> -->
-      <class-decl name='Sanitizer&lt;OT::GPOS&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1823'>
+      <class-decl name='Sanitizer&lt;OT::GPOS&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1821'>
         <member-function access='public' static='yes'>
           <!-- hb_blob_t* OT::Sanitizer<OT::GPOS>::sanitize() -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4GPOSEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -15980,7 +15967,7 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Sanitizer<OT::GSUB> -->
-      <class-decl name='Sanitizer&lt;OT::GSUB&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1824'>
+      <class-decl name='Sanitizer&lt;OT::GSUB&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1822'>
         <member-function access='public' static='yes'>
           <!-- hb_blob_t* OT::Sanitizer<OT::GSUB>::sanitize() -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4GSUBEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16001,18 +15988,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Index -->
-      <class-decl name='Index' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='675' column='1' id='type-id-855'>
+      <class-decl name='Index' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='675' column='1' id='type-id-853'>
         <!-- struct OT::IntType<short unsigned int, 2u> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-832'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-830'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Index::NOT_FOUND_INDEX -->
           <var-decl name='NOT_FOUND_INDEX' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='676' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-862'>
+      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-860'>
         <!-- struct OT::IntType<short unsigned int, 2u> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-832'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-830'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Offset<OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
@@ -16032,9 +16019,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-864'>
+      <class-decl name='OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-862'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16047,7 +16034,7 @@
           <!-- const OT::Anchor& OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6AnchorENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-518' is-artificial='yes'/>
+            <parameter type-id='type-id-516' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Anchor& -->
@@ -16058,9 +16045,9 @@
           <!-- bool OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_6AnchorENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-416' is-artificial='yes'/>
+            <parameter type-id='type-id-414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16069,9 +16056,9 @@
           <!-- bool OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_6AnchorENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-416' is-artificial='yes'/>
+            <parameter type-id='type-id-414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16080,9 +16067,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-866'>
+      <class-decl name='OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-864'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16095,7 +16082,7 @@
           <!-- const OT::AnchorMatrix& OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-523' is-artificial='yes'/>
+            <parameter type-id='type-id-521' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::AnchorMatrix& -->
@@ -16106,9 +16093,9 @@
           <!-- bool OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-418' is-artificial='yes'/>
+            <parameter type-id='type-id-416' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16117,9 +16104,9 @@
           <!-- bool OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' mangled-name='_ZN2OT8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEE8sanitizeIjEEbPNS_21hb_sanitize_context_tEPvT_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-418' is-artificial='yes'/>
+            <parameter type-id='type-id-416' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -16130,9 +16117,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-868'>
+      <class-decl name='OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-866'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16145,7 +16132,7 @@
           <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7ArrayOfINS_7IntTypeItLj2EEES3_EES3_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-443' is-artificial='yes'/>
+            <parameter type-id='type-id-441' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
@@ -16156,9 +16143,9 @@
           <!-- bool OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7ArrayOfINS_7IntTypeItLj2EEES3_EES3_E6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-421' is-artificial='yes'/>
+            <parameter type-id='type-id-419' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16167,9 +16154,9 @@
           <!-- bool OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_7ArrayOfINS_7IntTypeItLj2EEES3_EES3_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-421' is-artificial='yes'/>
+            <parameter type-id='type-id-419' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16178,9 +16165,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1227'>
+      <class-decl name='OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1225'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16193,7 +16180,7 @@
           <!-- const OT::AttachList& OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_10AttachListENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-444' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::AttachList& -->
@@ -16204,9 +16191,9 @@
           <!-- bool OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_10AttachListENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-409' is-artificial='yes'/>
+            <parameter type-id='type-id-407' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16215,9 +16202,9 @@
           <!-- bool OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_10AttachListENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-409' is-artificial='yes'/>
+            <parameter type-id='type-id-407' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16226,9 +16213,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-870'>
+      <class-decl name='OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-868'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16241,7 +16228,7 @@
           <!-- const OT::CaretValue& OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-452' is-artificial='yes'/>
+            <parameter type-id='type-id-450' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::CaretValue& -->
@@ -16252,9 +16239,9 @@
           <!-- bool OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-422' is-artificial='yes'/>
+            <parameter type-id='type-id-420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16263,9 +16250,9 @@
           <!-- bool OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-422' is-artificial='yes'/>
+            <parameter type-id='type-id-420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16274,9 +16261,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-872'>
+      <class-decl name='OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-870'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16289,7 +16276,7 @@
           <!-- const OT::ChainRule& OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-502' is-artificial='yes'/>
+            <parameter type-id='type-id-500' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::ChainRule& -->
@@ -16300,9 +16287,9 @@
           <!-- bool OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-427' is-artificial='yes'/>
+            <parameter type-id='type-id-425' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16311,9 +16298,9 @@
           <!-- bool OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-427' is-artificial='yes'/>
+            <parameter type-id='type-id-425' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16322,9 +16309,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-874'>
+      <class-decl name='OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-872'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16337,7 +16324,7 @@
           <!-- const OT::ChainRuleSet& OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-503' is-artificial='yes'/>
+            <parameter type-id='type-id-501' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::ChainRuleSet& -->
@@ -16348,9 +16335,9 @@
           <!-- bool OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-428' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16359,9 +16346,9 @@
           <!-- bool OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-428' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16370,9 +16357,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1231'>
+      <class-decl name='OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1229'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16385,7 +16372,7 @@
           <!-- const OT::ClassDef& OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8ClassDefENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-456' is-artificial='yes'/>
+            <parameter type-id='type-id-454' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::ClassDef& -->
@@ -16396,9 +16383,9 @@
           <!-- bool OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8ClassDefENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-408' is-artificial='yes'/>
+            <parameter type-id='type-id-406' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16407,9 +16394,9 @@
           <!-- bool OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8ClassDefENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-408' is-artificial='yes'/>
+            <parameter type-id='type-id-406' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16418,9 +16405,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-876'>
+      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-874'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16433,20 +16420,20 @@
           <!-- const OT::Coverage& OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-441' is-artificial='yes'/>
+            <parameter type-id='type-id-439' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-406' is-artificial='yes'/>
+            <parameter type-id='type-id-404' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16455,9 +16442,9 @@
           <!-- bool OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-406' is-artificial='yes'/>
+            <parameter type-id='type-id-404' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16468,20 +16455,20 @@
           <!-- OT::Coverage& OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, void*) -->
           <function-decl name='serialize' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEE9serializeEPNS_22hb_serialize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-406' is-artificial='yes'/>
+            <parameter type-id='type-id-404' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- OT::Coverage& -->
-            <return type-id='type-id-557'/>
+            <return type-id='type-id-555'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-878'>
+      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-876'>
         <!-- struct OT::Offset<OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16494,20 +16481,20 @@
           <!-- const OT::Coverage& OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-456' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-424' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16516,9 +16503,9 @@
           <!-- bool OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-424' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16527,9 +16514,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1234'>
+      <class-decl name='OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1232'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16542,7 +16529,7 @@
           <!-- const OT::Device& OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6DeviceENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-448' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Device& -->
@@ -16553,9 +16540,9 @@
           <!-- bool OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_6DeviceENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-407' is-artificial='yes'/>
+            <parameter type-id='type-id-405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16564,9 +16551,9 @@
           <!-- bool OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_6DeviceENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-407' is-artificial='yes'/>
+            <parameter type-id='type-id-405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16575,9 +16562,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1236'>
+      <class-decl name='OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1234'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16590,9 +16577,9 @@
           <!-- bool OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >::sanitize<const OT::Record<OT::Feature>::sanitize_closure_t*>(OT::hb_sanitize_context_t*, void*, const OT::Record<OT::Feature>::sanitize_closure_t*) -->
           <function-decl name='sanitize&lt;const OT::Record&lt;OT::Feature&gt;::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-439' is-artificial='yes'/>
+            <parameter type-id='type-id-437' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'const OT::Record<OT::Feature>::sanitize_closure_t*' -->
@@ -16605,7 +16592,7 @@
           <!-- const OT::Feature& OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7FeatureENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-477' is-artificial='yes'/>
+            <parameter type-id='type-id-475' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Feature& -->
@@ -16616,18 +16603,18 @@
           <!-- bool OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7FeatureENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-439' is-artificial='yes'/>
+            <parameter type-id='type-id-437' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1237'>
+      <class-decl name='OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1235'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16640,9 +16627,9 @@
           <!-- bool OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-405' is-artificial='yes'/>
+            <parameter type-id='type-id-403' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -16655,7 +16642,7 @@
           <!-- const OT::FeatureParams& OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13FeatureParamsENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-474' is-artificial='yes'/>
+            <parameter type-id='type-id-472' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::FeatureParams& -->
@@ -16666,18 +16653,18 @@
           <!-- bool OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_13FeatureParamsENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-405' is-artificial='yes'/>
+            <parameter type-id='type-id-403' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1238'>
+      <class-decl name='OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1236'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16690,9 +16677,9 @@
           <!-- bool OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::sanitize<const OT::Record<OT::LangSys>::sanitize_closure_t*>(OT::hb_sanitize_context_t*, void*, const OT::Record<OT::LangSys>::sanitize_closure_t*) -->
           <function-decl name='sanitize&lt;const OT::Record&lt;OT::LangSys&gt;::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-404' is-artificial='yes'/>
+            <parameter type-id='type-id-402' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'const OT::Record<OT::LangSys>::sanitize_closure_t*' -->
@@ -16705,7 +16692,7 @@
           <!-- const OT::LangSys& OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7LangSysENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-463' is-artificial='yes'/>
+            <parameter type-id='type-id-461' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::LangSys& -->
@@ -16716,9 +16703,9 @@
           <!-- bool OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7LangSysENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-404' is-artificial='yes'/>
+            <parameter type-id='type-id-402' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16727,9 +16714,9 @@
           <!-- bool OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_7LangSysENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-404' is-artificial='yes'/>
+            <parameter type-id='type-id-402' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16738,9 +16725,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1239'>
+      <class-decl name='OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1237'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16753,7 +16740,7 @@
           <!-- const OT::LigCaretList& OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12LigCaretListENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-452' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::LigCaretList& -->
@@ -16764,9 +16751,9 @@
           <!-- bool OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12LigCaretListENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-410' is-artificial='yes'/>
+            <parameter type-id='type-id-408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16775,9 +16762,9 @@
           <!-- bool OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12LigCaretListENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-410' is-artificial='yes'/>
+            <parameter type-id='type-id-408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16786,9 +16773,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-880'>
+      <class-decl name='OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-878'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16801,7 +16788,7 @@
           <!-- const OT::LigGlyph& OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-453' is-artificial='yes'/>
+            <parameter type-id='type-id-451' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::LigGlyph& -->
@@ -16812,9 +16799,9 @@
           <!-- bool OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-423' is-artificial='yes'/>
+            <parameter type-id='type-id-421' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16823,9 +16810,9 @@
           <!-- bool OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-423' is-artificial='yes'/>
+            <parameter type-id='type-id-421' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16834,9 +16821,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-882'>
+      <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-880'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16849,7 +16836,7 @@
           <!-- const OT::Ligature& OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <parameter type-id='type-id-490' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Ligature& -->
@@ -16860,9 +16847,9 @@
           <!-- bool OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-430' is-artificial='yes'/>
+            <parameter type-id='type-id-428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16871,9 +16858,9 @@
           <!-- bool OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-430' is-artificial='yes'/>
+            <parameter type-id='type-id-428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16884,20 +16871,20 @@
           <!-- OT::Ligature& OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, void*) -->
           <function-decl name='serialize' mangled-name='_ZN2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEE9serializeEPNS_22hb_serialize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-430' is-artificial='yes'/>
+            <parameter type-id='type-id-428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- OT::Ligature& -->
-            <return type-id='type-id-570'/>
+            <return type-id='type-id-568'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-884'>
+      <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-882'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16910,7 +16897,7 @@
           <!-- const OT::LigatureSet& OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-493' is-artificial='yes'/>
+            <parameter type-id='type-id-491' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::LigatureSet& -->
@@ -16921,9 +16908,9 @@
           <!-- bool OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-431' is-artificial='yes'/>
+            <parameter type-id='type-id-429' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16932,9 +16919,9 @@
           <!-- bool OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-431' is-artificial='yes'/>
+            <parameter type-id='type-id-429' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -16945,20 +16932,20 @@
           <!-- OT::LigatureSet& OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, void*) -->
           <function-decl name='serialize' mangled-name='_ZN2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEE9serializeEPNS_22hb_serialize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-431' is-artificial='yes'/>
+            <parameter type-id='type-id-429' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- OT::LigatureSet& -->
-            <return type-id='type-id-571'/>
+            <return type-id='type-id-569'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-886'>
+      <class-decl name='OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-884'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -16971,7 +16958,7 @@
           <!-- const OT::Lookup& OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-483' is-artificial='yes'/>
+            <parameter type-id='type-id-481' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Lookup& -->
@@ -16982,9 +16969,9 @@
           <!-- bool OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_6LookupENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-435' is-artificial='yes'/>
+            <parameter type-id='type-id-433' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16993,9 +16980,9 @@
           <!-- bool OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_6LookupENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-435' is-artificial='yes'/>
+            <parameter type-id='type-id-433' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17004,9 +16991,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1244'>
+      <class-decl name='OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1242'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17019,7 +17006,7 @@
           <!-- const OT::MarkArray& OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9MarkArrayENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-521' is-artificial='yes'/>
+            <parameter type-id='type-id-519' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::MarkArray& -->
@@ -17030,9 +17017,9 @@
           <!-- bool OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_9MarkArrayENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-417' is-artificial='yes'/>
+            <parameter type-id='type-id-415' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17041,9 +17028,9 @@
           <!-- bool OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_9MarkArrayENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-417' is-artificial='yes'/>
+            <parameter type-id='type-id-415' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17052,9 +17039,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-888'>
+      <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-886'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17067,7 +17054,7 @@
           <!-- const OT::MarkGlyphSets& OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13MarkGlyphSetsENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-459' is-artificial='yes'/>
+            <parameter type-id='type-id-457' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::MarkGlyphSets& -->
@@ -17078,9 +17065,9 @@
           <!-- bool OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_13MarkGlyphSetsENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-411' is-artificial='yes'/>
+            <parameter type-id='type-id-409' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17089,9 +17076,9 @@
           <!-- bool OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_13MarkGlyphSetsENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-411' is-artificial='yes'/>
+            <parameter type-id='type-id-409' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17100,9 +17087,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1245'>
+      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1243'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17115,9 +17102,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-419' is-artificial='yes'/>
+            <parameter type-id='type-id-417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -17130,7 +17117,7 @@
           <!-- const OT::OffsetListOf<OT::AnchorMatrix>& OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_12AnchorMatrixEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-526' is-artificial='yes'/>
+            <parameter type-id='type-id-524' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::OffsetListOf<OT::AnchorMatrix>& -->
@@ -17141,18 +17128,18 @@
           <!-- bool OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_12AnchorMatrixEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-419' is-artificial='yes'/>
+            <parameter type-id='type-id-417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1246'>
+      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1244'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17165,7 +17152,7 @@
           <!-- const OT::OffsetListOf<OT::Lookup>& OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_6LookupEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-484' is-artificial='yes'/>
+            <parameter type-id='type-id-482' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::OffsetListOf<OT::Lookup>& -->
@@ -17176,9 +17163,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_6LookupEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-414' is-artificial='yes'/>
+            <parameter type-id='type-id-412' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17187,9 +17174,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_6LookupEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-414' is-artificial='yes'/>
+            <parameter type-id='type-id-412' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17198,9 +17185,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1247'>
+      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1245'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17213,9 +17200,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_9PosLookupEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-420' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17224,9 +17211,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_9PosLookupEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-420' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17235,9 +17222,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1248'>
+      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1246'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17250,9 +17237,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_11SubstLookupEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-415' is-artificial='yes'/>
+            <parameter type-id='type-id-413' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17261,9 +17248,9 @@
           <!-- bool OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_11SubstLookupEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-415' is-artificial='yes'/>
+            <parameter type-id='type-id-413' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17272,9 +17259,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-890'>
+      <class-decl name='OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-888'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17287,13 +17274,13 @@
           <!-- bool OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >::sanitize<OT::PairSet::sanitize_closure_t*>(OT::hb_sanitize_context_t*, void*, OT::PairSet::sanitize_closure_t*) -->
           <function-decl name='sanitize&lt;OT::PairSet::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-433' is-artificial='yes'/>
+            <parameter type-id='type-id-431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'OT::PairSet::sanitize_closure_t*' -->
-            <parameter type-id='type-id-1270'/>
+            <parameter type-id='type-id-1268'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17302,7 +17289,7 @@
           <!-- const OT::PairSet& OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::PairSet& -->
@@ -17313,18 +17300,18 @@
           <!-- bool OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-433' is-artificial='yes'/>
+            <parameter type-id='type-id-431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-892'>
+      <class-decl name='OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-890'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17337,9 +17324,9 @@
           <!-- bool OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-437' is-artificial='yes'/>
+            <parameter type-id='type-id-435' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17348,9 +17335,9 @@
           <!-- bool OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-437' is-artificial='yes'/>
+            <parameter type-id='type-id-435' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17359,9 +17346,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-894'>
+      <class-decl name='OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-892'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17374,9 +17361,9 @@
           <!-- bool OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-434' is-artificial='yes'/>
+            <parameter type-id='type-id-432' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -17389,7 +17376,7 @@
           <!-- const OT::PosLookupSubTable& OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-533' is-artificial='yes'/>
+            <parameter type-id='type-id-531' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::PosLookupSubTable& -->
@@ -17400,18 +17387,18 @@
           <!-- bool OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-434' is-artificial='yes'/>
+            <parameter type-id='type-id-432' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1252'>
+      <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1250'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17424,7 +17411,7 @@
           <!-- const OT::RecordListOf<OT::Feature>& OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12RecordListOfINS_7FeatureEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-479' is-artificial='yes'/>
+            <parameter type-id='type-id-477' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::RecordListOf<OT::Feature>& -->
@@ -17435,9 +17422,9 @@
           <!-- bool OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12RecordListOfINS_7FeatureEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-413' is-artificial='yes'/>
+            <parameter type-id='type-id-411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17446,9 +17433,9 @@
           <!-- bool OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12RecordListOfINS_7FeatureEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-413' is-artificial='yes'/>
+            <parameter type-id='type-id-411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17457,9 +17444,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1253'>
+      <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1251'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17472,7 +17459,7 @@
           <!-- const OT::RecordListOf<OT::Script>& OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12RecordListOfINS_6ScriptEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-468' is-artificial='yes'/>
+            <parameter type-id='type-id-466' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::RecordListOf<OT::Script>& -->
@@ -17483,9 +17470,9 @@
           <!-- bool OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12RecordListOfINS_6ScriptEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-412' is-artificial='yes'/>
+            <parameter type-id='type-id-410' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17494,9 +17481,9 @@
           <!-- bool OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12RecordListOfINS_6ScriptEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-412' is-artificial='yes'/>
+            <parameter type-id='type-id-410' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17505,9 +17492,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-896'>
+      <class-decl name='OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-894'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17520,7 +17507,7 @@
           <!-- const OT::Rule& OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-496' is-artificial='yes'/>
+            <parameter type-id='type-id-494' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Rule& -->
@@ -17531,9 +17518,9 @@
           <!-- bool OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_4RuleENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-425' is-artificial='yes'/>
+            <parameter type-id='type-id-423' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17542,9 +17529,9 @@
           <!-- bool OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_4RuleENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-425' is-artificial='yes'/>
+            <parameter type-id='type-id-423' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17553,9 +17540,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-898'>
+      <class-decl name='OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-896'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17568,7 +17555,7 @@
           <!-- const OT::RuleSet& OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-497' is-artificial='yes'/>
+            <parameter type-id='type-id-495' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::RuleSet& -->
@@ -17579,9 +17566,9 @@
           <!-- bool OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-426' is-artificial='yes'/>
+            <parameter type-id='type-id-424' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17590,9 +17577,9 @@
           <!-- bool OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-426' is-artificial='yes'/>
+            <parameter type-id='type-id-424' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17601,9 +17588,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1256'>
+      <class-decl name='OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1254'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17616,9 +17603,9 @@
           <!-- bool OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >::sanitize<const OT::Record<OT::Script>::sanitize_closure_t*>(OT::hb_sanitize_context_t*, void*, const OT::Record<OT::Script>::sanitize_closure_t*) -->
           <function-decl name='sanitize&lt;const OT::Record&lt;OT::Script&gt;::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-436' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'const OT::Record<OT::Script>::sanitize_closure_t*' -->
@@ -17631,7 +17618,7 @@
           <!-- const OT::Script& OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6ScriptENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-466' is-artificial='yes'/>
+            <parameter type-id='type-id-464' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Script& -->
@@ -17642,18 +17629,18 @@
           <!-- bool OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_6ScriptENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-436' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-900'>
+      <class-decl name='OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-898'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17666,7 +17653,7 @@
           <!-- const OT::Sequence& OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-488' is-artificial='yes'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::Sequence& -->
@@ -17677,9 +17664,9 @@
           <!-- bool OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-429' is-artificial='yes'/>
+            <parameter type-id='type-id-427' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17688,9 +17675,9 @@
           <!-- bool OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-429' is-artificial='yes'/>
+            <parameter type-id='type-id-427' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17699,9 +17686,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-902'>
+      <class-decl name='OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-900'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17714,9 +17701,9 @@
           <!-- bool OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-436' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17725,9 +17712,9 @@
           <!-- bool OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-436' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17736,9 +17723,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-904'>
+      <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-902'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -17751,9 +17738,9 @@
           <!-- bool OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-432' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -17766,7 +17753,7 @@
           <!-- const OT::SubstLookupSubTable& OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-506' is-artificial='yes'/>
+            <parameter type-id='type-id-504' is-artificial='yes'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- const OT::SubstLookupSubTable& -->
@@ -17777,9 +17764,9 @@
           <!-- bool OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::neuter(OT::hb_sanitize_context_t*) -->
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-432' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17788,25 +17775,25 @@
           <!-- OT::SubstLookupSubTable& OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, void*) -->
           <function-decl name='serialize' mangled-name='_ZN2OT8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEE9serializeEPNS_22hb_serialize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-432' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1318'/>
+            <return type-id='type-id-1316'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1014'>
+      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1012'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::EntryExitRecord OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-854' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -17816,9 +17803,9 @@
           <!-- bool OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1013' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17827,9 +17814,9 @@
           <!-- bool OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1013' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -17840,7 +17827,7 @@
           <!-- const OT::EntryExitRecord& OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-514' is-artificial='yes'/>
+            <parameter type-id='type-id-512' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::EntryExitRecord& -->
@@ -17849,14 +17836,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1016'>
+      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1014'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Index OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-856' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-854' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -17866,7 +17853,7 @@
           <!-- const OT::Index* OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-461' is-artificial='yes'/>
+            <parameter type-id='type-id-459' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -17879,7 +17866,7 @@
           <!-- const OT::Index& OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-461' is-artificial='yes'/>
+            <parameter type-id='type-id-459' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::Index& -->
@@ -17890,9 +17877,9 @@
           <!-- bool OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17901,23 +17888,23 @@
           <!-- bool OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1018'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1016'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<unsigned int, 3u> OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-855' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -17927,9 +17914,9 @@
           <!-- bool OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeIjLj3EEENS1_ItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-1017' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17938,23 +17925,23 @@
           <!-- bool OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeIjLj3EEENS1_ItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-1017' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1020'>
+      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1018'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::LookupRecord OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -17964,9 +17951,9 @@
           <!-- bool OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_12LookupRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17975,23 +17962,23 @@
           <!-- bool OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_12LookupRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1022'>
+      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1020'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::MarkRecord OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-861' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18001,9 +17988,9 @@
           <!-- bool OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_10MarkRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1023' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18012,9 +17999,9 @@
           <!-- bool OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_10MarkRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1023' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18025,7 +18012,7 @@
           <!-- const OT::MarkRecord& OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_10MarkRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-519' is-artificial='yes'/>
+            <parameter type-id='type-id-517' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::MarkRecord& -->
@@ -18034,14 +18021,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1024'>
+      <class-decl name='ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1022'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Offset<OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-861' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18051,7 +18038,7 @@
           <!-- unsigned int OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-481' is-artificial='yes'/>
+            <parameter type-id='type-id-479' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -18060,9 +18047,9 @@
           <!-- bool OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-545' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18071,9 +18058,9 @@
           <!-- bool OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-545' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18082,9 +18069,9 @@
           <!-- bool OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E9serializeEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='818' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-545' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -18093,14 +18080,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1025'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1023'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18110,9 +18097,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18125,23 +18112,23 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1027'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1025'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18151,7 +18138,7 @@
           <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS0_INS_7IntTypeItLj2EEES3_EES3_EES3_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-440' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
@@ -18162,9 +18149,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS0_INS_7IntTypeItLj2EEES3_EES3_EES3_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1028' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18173,9 +18160,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS0_INS_7IntTypeItLj2EEES3_EES3_EES3_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1028' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18184,14 +18171,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1029'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1027'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18201,9 +18188,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1028' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18212,9 +18199,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1028' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18225,25 +18212,25 @@
           <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >* OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-444' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >* -->
-            <return type-id='type-id-452'/>
+            <return type-id='type-id-450'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1031'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1029'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-873' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18253,7 +18240,7 @@
           <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-500' is-artificial='yes'/>
+            <parameter type-id='type-id-498' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >& -->
@@ -18264,9 +18251,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18275,9 +18262,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18286,14 +18273,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1033'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1031'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-873' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18303,7 +18290,7 @@
           <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-499' is-artificial='yes'/>
+            <parameter type-id='type-id-497' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >& -->
@@ -18314,9 +18301,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-1032' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18325,9 +18312,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-1032' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18336,14 +18323,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1035'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1033'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18353,7 +18340,7 @@
           <!-- unsigned int OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-504' is-artificial='yes'/>
+            <parameter type-id='type-id-502' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -18362,7 +18349,7 @@
           <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-504' is-artificial='yes'/>
+            <parameter type-id='type-id-502' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >& -->
@@ -18373,9 +18360,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-1034' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18384,9 +18371,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-1034' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18395,14 +18382,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1037'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1035'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18412,7 +18399,7 @@
           <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >& OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEENS3_ItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-457' is-artificial='yes'/>
+            <parameter type-id='type-id-455' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >& -->
@@ -18423,9 +18410,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEENS3_ItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1038' is-artificial='yes'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18434,9 +18421,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEENS3_ItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1038' is-artificial='yes'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18445,14 +18432,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1039'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1037'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18462,9 +18449,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1040' is-artificial='yes'/>
+            <parameter type-id='type-id-1038' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18473,9 +18460,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1040' is-artificial='yes'/>
+            <parameter type-id='type-id-1038' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18486,7 +18473,7 @@
           <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-445' is-artificial='yes'/>
+            <parameter type-id='type-id-443' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >& -->
@@ -18495,14 +18482,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1041'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1039'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18512,7 +18499,7 @@
           <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-490' is-artificial='yes'/>
+            <parameter type-id='type-id-488' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& -->
@@ -18523,9 +18510,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-564' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18534,9 +18521,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-564' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18547,7 +18534,7 @@
           <!-- unsigned int OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-490' is-artificial='yes'/>
+            <parameter type-id='type-id-488' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -18556,9 +18543,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E9serializeEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='818' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-564' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -18569,23 +18556,23 @@
           <!-- OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-564' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1241'/>
+            <return type-id='type-id-1239'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1042'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1040'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18595,7 +18582,7 @@
           <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-489' is-artificial='yes'/>
+            <parameter type-id='type-id-487' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& -->
@@ -18606,9 +18593,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-564' is-artificial='yes'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18617,9 +18604,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-564' is-artificial='yes'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18630,7 +18617,7 @@
           <!-- unsigned int OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-489' is-artificial='yes'/>
+            <parameter type-id='type-id-487' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -18639,9 +18626,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E9serializeEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='818' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-564' is-artificial='yes'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -18652,23 +18639,23 @@
           <!-- OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-564' is-artificial='yes'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1242'/>
+            <return type-id='type-id-1240'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1043'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1041'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18678,9 +18665,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1044' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18689,9 +18676,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1044' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18700,14 +18687,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1045'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1043'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18717,13 +18704,13 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<OT::PairSet::sanitize_closure_t*>(OT::hb_sanitize_context_t*, void*, OT::PairSet::sanitize_closure_t*) -->
           <function-decl name='sanitize&lt;OT::PairSet::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1046' is-artificial='yes'/>
+            <parameter type-id='type-id-1044' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'OT::PairSet::sanitize_closure_t*' -->
-            <parameter type-id='type-id-1270'/>
+            <parameter type-id='type-id-1268'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18732,9 +18719,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1046' is-artificial='yes'/>
+            <parameter type-id='type-id-1044' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18743,7 +18730,7 @@
           <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-511' is-artificial='yes'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >& -->
@@ -18752,14 +18739,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1047'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1045'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18769,9 +18756,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1048' is-artificial='yes'/>
+            <parameter type-id='type-id-1046' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18780,9 +18767,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1048' is-artificial='yes'/>
+            <parameter type-id='type-id-1046' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18791,14 +18778,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1049'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1047'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18808,9 +18795,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1050' is-artificial='yes'/>
+            <parameter type-id='type-id-1048' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18823,7 +18810,7 @@
           <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-510' is-artificial='yes'/>
+            <parameter type-id='type-id-508' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
@@ -18834,23 +18821,23 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1050' is-artificial='yes'/>
+            <parameter type-id='type-id-1048' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1051'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1049'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-897' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18860,7 +18847,7 @@
           <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-495' is-artificial='yes'/>
+            <parameter type-id='type-id-493' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >& -->
@@ -18871,9 +18858,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <parameter type-id='type-id-1050' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18882,9 +18869,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <parameter type-id='type-id-1050' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18893,14 +18880,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1053'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1051'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-897' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18910,7 +18897,7 @@
           <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-494' is-artificial='yes'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >& -->
@@ -18921,9 +18908,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1054' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18932,9 +18919,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1054' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18943,14 +18930,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1055'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1053'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -18960,7 +18947,7 @@
           <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-487' is-artificial='yes'/>
+            <parameter type-id='type-id-485' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >& -->
@@ -18971,9 +18958,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1056' is-artificial='yes'/>
+            <parameter type-id='type-id-1054' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18982,9 +18969,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1056' is-artificial='yes'/>
+            <parameter type-id='type-id-1054' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -18993,14 +18980,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1057'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1055'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19010,9 +18997,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19021,9 +19008,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -19032,14 +19019,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1059'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1057'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19049,9 +19036,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
+            <parameter type-id='type-id-1058' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'unsigned int' -->
@@ -19064,7 +19051,7 @@
           <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-486' is-artificial='yes'/>
+            <parameter type-id='type-id-484' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
@@ -19075,9 +19062,9 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
+            <parameter type-id='type-id-1058' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19086,23 +19073,23 @@
           <!-- OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
+            <parameter type-id='type-id-1058' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1259'/>
+            <return type-id='type-id-1257'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1061'>
+      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1059'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::RangeRecord OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19112,7 +19099,7 @@
           <!-- const OT::RangeRecord& OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-440' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::RangeRecord& -->
@@ -19123,9 +19110,9 @@
           <!-- bool OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1062' is-artificial='yes'/>
+            <parameter type-id='type-id-1060' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19134,9 +19121,9 @@
           <!-- bool OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1062' is-artificial='yes'/>
+            <parameter type-id='type-id-1060' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19145,7 +19132,7 @@
           <!-- unsigned int OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEE8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-440' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -19154,23 +19141,23 @@
           <!-- OT::RangeRecord& OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1062' is-artificial='yes'/>
+            <parameter type-id='type-id-1060' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::RangeRecord& -->
-            <return type-id='type-id-1276'/>
+            <return type-id='type-id-1274'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1063'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1061'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::Feature> OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-909' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19180,7 +19167,7 @@
           <!-- const OT::Record<OT::Feature>& OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-469' is-artificial='yes'/>
+            <parameter type-id='type-id-467' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::Record<OT::Feature>& -->
@@ -19191,22 +19178,22 @@
           <!-- const OT::Record<OT::Feature>* OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-469' is-artificial='yes'/>
+            <parameter type-id='type-id-467' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::Record<OT::Feature>* -->
-            <return type-id='type-id-478'/>
+            <return type-id='type-id-476'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1064' is-artificial='yes'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19215,9 +19202,9 @@
           <!-- bool OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1064' is-artificial='yes'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -19226,14 +19213,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1065'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1063'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::LangSys> OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-911' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-909' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19243,7 +19230,7 @@
           <!-- const OT::Record<OT::LangSys>& OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-464' is-artificial='yes'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::Record<OT::LangSys>& -->
@@ -19254,22 +19241,22 @@
           <!-- const OT::Record<OT::LangSys>* OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-464' is-artificial='yes'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::Record<OT::LangSys>* -->
-            <return type-id='type-id-465'/>
+            <return type-id='type-id-463'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1066' is-artificial='yes'/>
+            <parameter type-id='type-id-1064' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19278,9 +19265,9 @@
           <!-- bool OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1066' is-artificial='yes'/>
+            <parameter type-id='type-id-1064' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -19289,14 +19276,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1067'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1065'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::Script> OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-913' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-911' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19306,7 +19293,7 @@
           <!-- const OT::Record<OT::Script>& OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-460' is-artificial='yes'/>
+            <parameter type-id='type-id-458' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::Record<OT::Script>& -->
@@ -19317,22 +19304,22 @@
           <!-- const OT::Record<OT::Script>* OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-460' is-artificial='yes'/>
+            <parameter type-id='type-id-458' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::Record<OT::Script>* -->
-            <return type-id='type-id-467'/>
+            <return type-id='type-id-465'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- bool OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
+            <parameter type-id='type-id-1066' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19341,9 +19328,9 @@
           <!-- bool OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
+            <parameter type-id='type-id-1066' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -19352,96 +19339,96 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::AnchorMatrix> -->
-      <class-decl name='OffsetArrayOf&lt;OT::AnchorMatrix&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1825'>
+      <class-decl name='OffsetArrayOf&lt;OT::AnchorMatrix&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1823'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1025'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1023'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1826'>
+      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1824'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1027'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1025'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::CaretValue> -->
-      <class-decl name='OffsetArrayOf&lt;OT::CaretValue&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1827'>
+      <class-decl name='OffsetArrayOf&lt;OT::CaretValue&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1825'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1029'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1027'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::ChainRule> -->
-      <class-decl name='OffsetArrayOf&lt;OT::ChainRule&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1828'>
+      <class-decl name='OffsetArrayOf&lt;OT::ChainRule&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1826'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1031'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1029'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::ChainRuleSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1829'>
+      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1827'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1033'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1031'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::Coverage> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1830'>
+      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1828'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1035'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1033'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::LigGlyph> -->
-      <class-decl name='OffsetArrayOf&lt;OT::LigGlyph&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1831'>
+      <class-decl name='OffsetArrayOf&lt;OT::LigGlyph&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1829'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1039'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1037'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::Ligature> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1832'>
+      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1830'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1041'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1039'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::LigatureSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1833'>
+      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1831'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1042'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1040'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::Lookup> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Lookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1834'>
+      <class-decl name='OffsetArrayOf&lt;OT::Lookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1832'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1043'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1041'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::PairSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1835'>
+      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1833'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1045'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1043'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::PosLookup> -->
-      <class-decl name='OffsetArrayOf&lt;OT::PosLookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1836'>
+      <class-decl name='OffsetArrayOf&lt;OT::PosLookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1834'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1047'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1045'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::Rule> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Rule&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1837'>
+      <class-decl name='OffsetArrayOf&lt;OT::Rule&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1835'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1051'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1049'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::RuleSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1838'>
+      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1836'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1053'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1051'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::Sequence> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1839'>
+      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1837'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1055'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1053'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::SubstLookup> -->
-      <class-decl name='OffsetArrayOf&lt;OT::SubstLookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1840'>
+      <class-decl name='OffsetArrayOf&lt;OT::SubstLookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1838'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1057'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1055'/>
       </class-decl>
       <!-- struct OT::OffsetListOf<OT::AnchorMatrix> -->
-      <class-decl name='OffsetListOf&lt;OT::AnchorMatrix&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1213'>
+      <class-decl name='OffsetListOf&lt;OT::AnchorMatrix&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1211'>
         <!-- struct OT::OffsetArrayOf<OT::AnchorMatrix> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1825'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1823'/>
         <member-function access='public'>
           <!-- bool OT::OffsetListOf<OT::AnchorMatrix>::sanitize<unsigned int>(OT::hb_sanitize_context_t*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='917' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetListOf<OT::AnchorMatrix>*' -->
-            <parameter type-id='type-id-1215' is-artificial='yes'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -19461,9 +19448,9 @@
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetListOf<OT::Lookup> -->
-      <class-decl name='OffsetListOf&lt;OT::Lookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1216'>
+      <class-decl name='OffsetListOf&lt;OT::Lookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1214'>
         <!-- struct OT::OffsetArrayOf<OT::Lookup> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1834'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1832'/>
         <member-function access='public'>
           <!-- const OT::Lookup& OT::OffsetListOf<OT::Lookup>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12OffsetListOfINS_6LookupEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19479,55 +19466,55 @@
           <!-- bool OT::OffsetListOf<OT::Lookup>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12OffsetListOfINS_6LookupEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetListOf<OT::Lookup>*' -->
-            <parameter type-id='type-id-1218' is-artificial='yes'/>
+            <parameter type-id='type-id-1216' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetListOf<OT::PosLookup> -->
-      <class-decl name='OffsetListOf&lt;OT::PosLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1219'>
+      <class-decl name='OffsetListOf&lt;OT::PosLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1217'>
         <!-- struct OT::OffsetArrayOf<OT::PosLookup> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1836'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1834'/>
         <member-function access='public'>
           <!-- bool OT::OffsetListOf<OT::PosLookup>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12OffsetListOfINS_9PosLookupEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetListOf<OT::PosLookup>*' -->
-            <parameter type-id='type-id-1221' is-artificial='yes'/>
+            <parameter type-id='type-id-1219' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetListOf<OT::SubstLookup> -->
-      <class-decl name='OffsetListOf&lt;OT::SubstLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1222'>
+      <class-decl name='OffsetListOf&lt;OT::SubstLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1220'>
         <!-- struct OT::OffsetArrayOf<OT::SubstLookup> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1840'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1838'/>
         <member-function access='public'>
           <!-- bool OT::OffsetListOf<OT::SubstLookup>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12OffsetListOfINS_11SubstLookupEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::OffsetListOf<OT::SubstLookup>*' -->
-            <parameter type-id='type-id-1224' is-artificial='yes'/>
+            <parameter type-id='type-id-1222' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='927' column='1' id='type-id-1166'>
+      <class-decl name='HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='927' column='1' id='type-id-1164'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::len -->
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='972' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='972' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<short unsigned int, 2u> OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
+          <var-decl name='array' type-id='type-id-677' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19537,7 +19524,7 @@
           <!-- unsigned int OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='933' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-491' is-artificial='yes'/>
+            <parameter type-id='type-id-489' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -19546,20 +19533,20 @@
           <!-- const OT::IntType<short unsigned int, 2u>& OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='928' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-491' is-artificial='yes'/>
+            <parameter type-id='type-id-489' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::IntType<short unsigned int, 2u>& -->
-            <return type-id='type-id-294'/>
+            <return type-id='type-id-292'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::sanitize_shallow(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='951' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-568' is-artificial='yes'/>
+            <parameter type-id='type-id-566' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19568,9 +19555,9 @@
           <!-- bool OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_E8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='956' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-568' is-artificial='yes'/>
+            <parameter type-id='type-id-566' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19579,11 +19566,11 @@
           <!-- bool OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_E9serializeEPNS_22hb_serialize_context_tERNS_8SupplierIS2_EEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-568' is-artificial='yes'/>
+            <parameter type-id='type-id-566' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -19594,14 +19581,14 @@
       <!-- struct OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1744'>
         <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-704'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
             <parameter type-id='type-id-1746' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -19612,7 +19599,7 @@
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
             <parameter type-id='type-id-1746' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -19621,14 +19608,14 @@
       <!-- struct OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1747'>
         <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1061'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1059'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
             <parameter type-id='type-id-1749' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -19639,28 +19626,28 @@
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
             <parameter type-id='type-id-1749' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1841'>
+      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1839'>
         <!-- struct OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1063'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1061'/>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1750'>
         <!-- struct OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1065'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1063'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_tag_t>(const hb_tag_t&) -->
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*' -->
             <parameter type-id='type-id-1752' is-artificial='yes'/>
             <!-- parameter of type 'const hb_tag_t&' -->
-            <parameter type-id='type-id-1803'/>
+            <parameter type-id='type-id-1807'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -19669,32 +19656,32 @@
       <!-- struct OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1753'>
         <!-- struct OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1067'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1065'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_tag_t>(const hb_tag_t&) -->
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
             <parameter type-id='type-id-1755' is-artificial='yes'/>
             <!-- parameter of type 'const hb_tag_t&' -->
-            <parameter type-id='type-id-1803'/>
+            <parameter type-id='type-id-1807'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Record<OT::Feature> -->
-      <class-decl name='Record&lt;OT::Feature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-908'>
+      <class-decl name='Record&lt;OT::Feature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-906'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::Feature>::sanitize_closure_t -->
           <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1683'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::Feature>::tag -->
-          <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
+          <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > OT::Record<OT::Feature>::offset -->
-          <var-decl name='offset' type-id='type-id-1236' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
+          <var-decl name='offset' type-id='type-id-1234' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::Feature>::static_size -->
@@ -19708,9 +19695,9 @@
           <!-- bool OT::Record<OT::Feature>::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT6RecordINS_7FeatureEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Record<OT::Feature>*' -->
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
+            <parameter type-id='type-id-1277' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -19719,18 +19706,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Record<OT::LangSys> -->
-      <class-decl name='Record&lt;OT::LangSys&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-910'>
+      <class-decl name='Record&lt;OT::LangSys&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-908'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::LangSys>::sanitize_closure_t -->
           <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1688'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::LangSys>::tag -->
-          <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
+          <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > OT::Record<OT::LangSys>::offset -->
-          <var-decl name='offset' type-id='type-id-1238' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
+          <var-decl name='offset' type-id='type-id-1236' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::LangSys>::static_size -->
@@ -19744,7 +19731,7 @@
           <!-- int OT::Record<OT::LangSys>::cmp(unsigned int) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT6RecordINS_7LangSysEE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Record<OT::LangSys>*' -->
-            <parameter type-id='type-id-465' is-artificial='yes'/>
+            <parameter type-id='type-id-463' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- int -->
@@ -19755,9 +19742,9 @@
           <!-- bool OT::Record<OT::LangSys>::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT6RecordINS_7LangSysEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Record<OT::LangSys>*' -->
-            <parameter type-id='type-id-1281' is-artificial='yes'/>
+            <parameter type-id='type-id-1279' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -19766,18 +19753,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Record<OT::Script> -->
-      <class-decl name='Record&lt;OT::Script&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-912'>
+      <class-decl name='Record&lt;OT::Script&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-910'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::Script>::sanitize_closure_t -->
           <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1693'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::Script>::tag -->
-          <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
+          <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > OT::Record<OT::Script>::offset -->
-          <var-decl name='offset' type-id='type-id-1256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
+          <var-decl name='offset' type-id='type-id-1254' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::Script>::static_size -->
@@ -19791,7 +19778,7 @@
           <!-- int OT::Record<OT::Script>::cmp(unsigned int) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT6RecordINS_6ScriptEE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Record<OT::Script>*' -->
-            <parameter type-id='type-id-467' is-artificial='yes'/>
+            <parameter type-id='type-id-465' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- int -->
@@ -19802,9 +19789,9 @@
           <!-- bool OT::Record<OT::Script>::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT6RecordINS_6ScriptEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Record<OT::Script>*' -->
-            <parameter type-id='type-id-1283' is-artificial='yes'/>
+            <parameter type-id='type-id-1281' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -19815,7 +19802,7 @@
       <!-- struct OT::RecordArrayOf<OT::Feature> -->
       <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1696'>
         <!-- struct OT::SortedArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1841'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1839'/>
         <member-function access='public'>
           <!-- const OT::Tag& OT::RecordArrayOf<OT::Feature>::get_tag(unsigned int) -->
           <function-decl name='get_tag' mangled-name='_ZNK2OT13RecordArrayOfINS_7FeatureEE7get_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19837,7 +19824,7 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_tag_t*' -->
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -19870,7 +19857,7 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_tag_t*' -->
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -19903,14 +19890,14 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_tag_t*' -->
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::RecordListOf<OT::Feature> -->
-      <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1284'>
+      <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1282'>
         <!-- struct OT::RecordArrayOf<OT::Feature> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1696'/>
         <member-function access='public'>
@@ -19928,16 +19915,16 @@
           <!-- bool OT::RecordListOf<OT::Feature>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12RecordListOfINS_7FeatureEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::RecordListOf<OT::Feature>*' -->
-            <parameter type-id='type-id-1286' is-artificial='yes'/>
+            <parameter type-id='type-id-1284' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::RecordListOf<OT::Script> -->
-      <class-decl name='RecordListOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1287'>
+      <class-decl name='RecordListOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1285'>
         <!-- struct OT::RecordArrayOf<OT::Script> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1702'/>
         <member-function access='public'>
@@ -19955,27 +19942,27 @@
           <!-- bool OT::RecordListOf<OT::Script>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12RecordListOfINS_6ScriptEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::RecordListOf<OT::Script>*' -->
-            <parameter type-id='type-id-1289' is-artificial='yes'/>
+            <parameter type-id='type-id-1287' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::RangeRecord -->
-      <class-decl name='RangeRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='132' column='1' id='type-id-906'>
+      <class-decl name='RangeRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='132' column='1' id='type-id-904'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::GlyphID OT::RangeRecord::start -->
-          <var-decl name='start' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
+          <var-decl name='start' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::GlyphID OT::RangeRecord::end -->
-          <var-decl name='end' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
+          <var-decl name='end' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::RangeRecord::value -->
-          <var-decl name='value' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='153' column='1'/>
+          <var-decl name='value' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='153' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::RangeRecord::static_size -->
@@ -19991,7 +19978,7 @@
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
             <parameter type-id='type-id-1680' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20002,7 +19989,7 @@
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
             <parameter type-id='type-id-1680' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20024,7 +20011,7 @@
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
             <parameter type-id='type-id-1680' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20035,7 +20022,7 @@
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
             <parameter type-id='type-id-1680' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20044,7 +20031,7 @@
       <!-- struct OT::IndexArray -->
       <class-decl name='IndexArray' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-1538'>
         <!-- struct OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1016'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1014'/>
         <member-function access='public'>
           <!-- unsigned int OT::IndexArray::get_indexes(unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_indexes' mangled-name='_ZNK2OT10IndexArray11get_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20062,14 +20049,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::LangSys -->
-      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-1169'>
+      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-1167'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Offset<OT::IntType<short unsigned int, 2u> > OT::LangSys::lookupOrderZ -->
-          <var-decl name='lookupOrderZ' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
+          <var-decl name='lookupOrderZ' type-id='type-id-860' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::LangSys::reqFeatureIndex -->
-          <var-decl name='reqFeatureIndex' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='209' column='1'/>
+          <var-decl name='reqFeatureIndex' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='209' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::IndexArray OT::LangSys::featureIndex -->
@@ -20083,7 +20070,7 @@
           <!-- unsigned int OT::LangSys::get_feature_count() -->
           <function-decl name='get_feature_count' mangled-name='_ZNK2OT7LangSys17get_feature_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LangSys*' -->
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -20092,18 +20079,18 @@
           <!-- hb_tag_t OT::LangSys::get_feature_index(unsigned int) -->
           <function-decl name='get_feature_index' mangled-name='_ZNK2OT7LangSys17get_feature_indexEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LangSys*' -->
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef hb_tag_t -->
-            <return type-id='type-id-187'/>
+            <return type-id='type-id-185'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::LangSys::get_feature_indexes(unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_feature_indexes' mangled-name='_ZNK2OT7LangSys19get_feature_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LangSys*' -->
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -20118,7 +20105,7 @@
           <!-- unsigned int OT::LangSys::get_required_feature_index() -->
           <function-decl name='get_required_feature_index' mangled-name='_ZNK2OT7LangSys26get_required_feature_indexEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LangSys*' -->
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -20127,7 +20114,7 @@
           <!-- bool OT::LangSys::has_required_feature() -->
           <function-decl name='has_required_feature' mangled-name='_ZNK2OT7LangSys20has_required_featureEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LangSys*' -->
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20136,9 +20123,9 @@
           <!-- bool OT::LangSys::sanitize(OT::hb_sanitize_context_t*, const OT::Record<OT::LangSys>::sanitize_closure_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7LangSys8sanitizeEPNS_21hb_sanitize_context_tEPKNS_6RecordIS0_E18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LangSys*' -->
-            <parameter type-id='type-id-1171' is-artificial='yes'/>
+            <parameter type-id='type-id-1169' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'const OT::Record<OT::LangSys>::sanitize_closure_t*' -->
             <parameter type-id='type-id-1690'/>
             <!-- bool -->
@@ -20147,10 +20134,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Script -->
-      <class-decl name='Script' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='220' column='1' id='type-id-1300'>
+      <class-decl name='Script' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='220' column='1' id='type-id-1298'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > OT::Script::defaultLangSys -->
-          <var-decl name='defaultLangSys' type-id='type-id-1238' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='248' column='1'/>
+          <var-decl name='defaultLangSys' type-id='type-id-1236' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='248' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::RecordArrayOf<OT::LangSys> OT::Script::langSys -->
@@ -20173,9 +20160,9 @@
           <!-- bool OT::Script::sanitize(OT::hb_sanitize_context_t*, const OT::Record<OT::Script>::sanitize_closure_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT6Script8sanitizeEPNS_21hb_sanitize_context_tEPKNS_6RecordIS0_E18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Script*' -->
-            <parameter type-id='type-id-1302' is-artificial='yes'/>
+            <parameter type-id='type-id-1300' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'const OT::Record<OT::Script>::sanitize_closure_t*' -->
             <parameter type-id='type-id-1695'/>
             <!-- bool -->
@@ -20192,7 +20179,7 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_tag_t*' -->
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -20214,7 +20201,7 @@
             <!-- implicit parameter of type 'const OT::Script*' -->
             <parameter type-id='type-id-1726' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- bool -->
@@ -20223,26 +20210,26 @@
         </member-function>
       </class-decl>
       <!-- struct OT::FeatureParamsSize -->
-      <class-decl name='FeatureParamsSize' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-1154'>
+      <class-decl name='FeatureParamsSize' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-1152'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsSize::designSize -->
-          <var-decl name='designSize' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='332' column='1'/>
+          <var-decl name='designSize' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='332' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::FeatureParamsSize::subfamilyID -->
-          <var-decl name='subfamilyID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='337' column='1'/>
+          <var-decl name='subfamilyID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='337' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::FeatureParamsSize::subfamilyNameID -->
-          <var-decl name='subfamilyNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='347' column='1'/>
+          <var-decl name='subfamilyNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='347' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::FeatureParamsSize::rangeStart -->
-          <var-decl name='rangeStart' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='361' column='1'/>
+          <var-decl name='rangeStart' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='361' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::USHORT OT::FeatureParamsSize::rangeEnd -->
-          <var-decl name='rangeEnd' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='364' column='1'/>
+          <var-decl name='rangeEnd' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='364' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsSize::static_size -->
@@ -20256,23 +20243,23 @@
           <!-- bool OT::FeatureParamsSize::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT17FeatureParamsSize8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::FeatureParamsSize*' -->
-            <parameter type-id='type-id-1155' is-artificial='yes'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::FeatureParamsStylisticSet -->
-      <class-decl name='FeatureParamsStylisticSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-1156'>
+      <class-decl name='FeatureParamsStylisticSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-1154'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsStylisticSet::version -->
-          <var-decl name='version' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='381' column='1'/>
+          <var-decl name='version' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='381' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::FeatureParamsStylisticSet::uiNameID -->
-          <var-decl name='uiNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='386' column='1'/>
+          <var-decl name='uiNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsStylisticSet::static_size -->
@@ -20286,43 +20273,43 @@
           <!-- bool OT::FeatureParamsStylisticSet::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT25FeatureParamsStylisticSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::FeatureParamsStylisticSet*' -->
-            <parameter type-id='type-id-1157' is-artificial='yes'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::FeatureParamsCharacterVariants -->
-      <class-decl name='FeatureParamsCharacterVariants' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-1152'>
+      <class-decl name='FeatureParamsCharacterVariants' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-1150'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsCharacterVariants::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='413' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='413' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::FeatureParamsCharacterVariants::featUILableNameID -->
-          <var-decl name='featUILableNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='414' column='1'/>
+          <var-decl name='featUILableNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='414' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::FeatureParamsCharacterVariants::featUITooltipTextNameID -->
-          <var-decl name='featUITooltipTextNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='419' column='1'/>
+          <var-decl name='featUITooltipTextNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='419' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::FeatureParamsCharacterVariants::sampleTextNameID -->
-          <var-decl name='sampleTextNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='425' column='1'/>
+          <var-decl name='sampleTextNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='425' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::USHORT OT::FeatureParamsCharacterVariants::numNamedParameters -->
-          <var-decl name='numNamedParameters' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='429' column='1'/>
+          <var-decl name='numNamedParameters' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='429' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='80'>
           <!-- OT::USHORT OT::FeatureParamsCharacterVariants::firstParamUILabelNameID -->
-          <var-decl name='firstParamUILabelNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='431' column='1'/>
+          <var-decl name='firstParamUILabelNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='431' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
           <!-- OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > OT::FeatureParamsCharacterVariants::characters -->
-          <var-decl name='characters' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
+          <var-decl name='characters' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsCharacterVariants::min_size -->
@@ -20332,36 +20319,36 @@
           <!-- bool OT::FeatureParamsCharacterVariants::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT30FeatureParamsCharacterVariants8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::FeatureParamsCharacterVariants*' -->
-            <parameter type-id='type-id-1153' is-artificial='yes'/>
+            <parameter type-id='type-id-1151' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::FeatureParams -->
-      <class-decl name='FeatureParams' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='446' column='1' id='type-id-1149'>
+      <class-decl name='FeatureParams' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='446' column='1' id='type-id-1147'>
         <member-type access='private'>
           <!-- union {OT::FeatureParamsSize size; OT::FeatureParamsStylisticSet stylisticSet; OT::FeatureParamsCharacterVariants characterVariants;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-1843'>
+          <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-1841'>
             <data-member access='public'>
               <!-- OT::FeatureParamsSize size -->
-              <var-decl name='size' type-id='type-id-1154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
+              <var-decl name='size' type-id='type-id-1152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::FeatureParamsStylisticSet stylisticSet -->
-              <var-decl name='stylisticSet' type-id='type-id-1156' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
+              <var-decl name='stylisticSet' type-id='type-id-1154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::FeatureParamsCharacterVariants characterVariants -->
-              <var-decl name='characterVariants' type-id='type-id-1152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
+              <var-decl name='characterVariants' type-id='type-id-1150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- union {OT::FeatureParamsSize size; OT::FeatureParamsStylisticSet stylisticSet; OT::FeatureParamsCharacterVariants characterVariants;} OT::FeatureParams::u -->
-          <var-decl name='u' type-id='type-id-1843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='470' column='1'/>
+          <var-decl name='u' type-id='type-id-1841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='470' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static const unsigned int OT::FeatureParams::static_size -->
@@ -20375,11 +20362,11 @@
           <!-- bool OT::FeatureParams::sanitize(OT::hb_sanitize_context_t*, hb_tag_t) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT13FeatureParams8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='447' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::FeatureParams*' -->
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1149' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20390,17 +20377,17 @@
             <!-- implicit parameter of type 'const OT::FeatureParams*' -->
             <parameter type-id='type-id-1520' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <!-- const OT::FeatureParamsSize& -->
             <return type-id='type-id-1523'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Feature -->
-      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-1146'>
+      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-1144'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > OT::Feature::featureParams -->
-          <var-decl name='featureParams' type-id='type-id-1237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
+          <var-decl name='featureParams' type-id='type-id-1235' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IndexArray OT::Feature::lookupIndex -->
@@ -20414,9 +20401,9 @@
           <!-- bool OT::Feature::sanitize(OT::hb_sanitize_context_t*, const OT::Record<OT::Feature>::sanitize_closure_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7Feature8sanitizeEPNS_21hb_sanitize_context_tEPKNS_6RecordIS0_E18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Feature*' -->
-            <parameter type-id='type-id-1148' is-artificial='yes'/>
+            <parameter type-id='type-id-1146' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'const OT::Record<OT::Feature>::sanitize_closure_t*' -->
             <parameter type-id='type-id-1685'/>
             <!-- bool -->
@@ -20427,7 +20414,7 @@
           <!-- const OT::FeatureParams& OT::Feature::get_feature_params() -->
           <function-decl name='get_feature_params' mangled-name='_ZNK2OT7Feature18get_feature_paramsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Feature*' -->
-            <parameter type-id='type-id-475' is-artificial='yes'/>
+            <parameter type-id='type-id-473' is-artificial='yes'/>
             <!-- const OT::FeatureParams& -->
             <return type-id='type-id-1519'/>
           </function-decl>
@@ -20436,7 +20423,7 @@
           <!-- unsigned int OT::Feature::get_lookup_indexes(unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_lookup_indexes' mangled-name='_ZNK2OT7Feature18get_lookup_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='480' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Feature*' -->
-            <parameter type-id='type-id-475' is-artificial='yes'/>
+            <parameter type-id='type-id-473' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -20449,22 +20436,22 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Lookup -->
-      <class-decl name='Lookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='561' column='1' id='type-id-1183'>
+      <class-decl name='Lookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='561' column='1' id='type-id-1181'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::Lookup::lookupType -->
-          <var-decl name='lookupType' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='610' column='1'/>
+          <var-decl name='lookupType' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='610' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::Lookup::lookupFlag -->
-          <var-decl name='lookupFlag' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='611' column='1'/>
+          <var-decl name='lookupFlag' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='611' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > OT::Lookup::subTable -->
-          <var-decl name='subTable' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='613' column='1'/>
+          <var-decl name='subTable' type-id='type-id-1022' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='613' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::USHORT OT::Lookup::markFilteringSetX[1] -->
-          <var-decl name='markFilteringSetX' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
+          <var-decl name='markFilteringSetX' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Lookup::min_size -->
@@ -20474,7 +20461,7 @@
           <!-- uint32_t OT::Lookup::get_props() -->
           <function-decl name='get_props' mangled-name='_ZNK2OT6Lookup9get_propsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='569' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Lookup*' -->
-            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
             <!-- typedef uint32_t -->
             <return type-id='type-id-100'/>
           </function-decl>
@@ -20483,7 +20470,7 @@
           <!-- unsigned int OT::Lookup::get_type() -->
           <function-decl name='get_type' mangled-name='_ZNK2OT6Lookup8get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='564' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Lookup*' -->
-            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -20492,7 +20479,7 @@
           <!-- unsigned int OT::Lookup::get_subtable_count() -->
           <function-decl name='get_subtable_count' mangled-name='_ZNK2OT6Lookup18get_subtable_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='562' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Lookup*' -->
-            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -20501,9 +20488,9 @@
           <!-- bool OT::Lookup::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT6Lookup8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='598' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Lookup*' -->
-            <parameter type-id='type-id-544' is-artificial='yes'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20512,9 +20499,9 @@
           <!-- bool OT::Lookup::serialize(OT::hb_serialize_context_t*, unsigned int, uint32_t, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT6Lookup9serializeEPNS_22hb_serialize_context_tEjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='580' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Lookup*' -->
-            <parameter type-id='type-id-544' is-artificial='yes'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'typedef uint32_t' -->
@@ -20527,10 +20514,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CoverageFormat1 -->
-      <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-1125'>
+      <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-1123'>
         <member-type access='public'>
           <!-- struct OT::CoverageFormat1::Iter -->
-          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1126'>
+          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1124'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat1* OT::CoverageFormat1::Iter::c -->
               <var-decl name='c' type-id='type-id-1494' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
@@ -20543,7 +20530,7 @@
               <!-- uint16_t OT::CoverageFormat1::Iter::get_coverage() -->
               <function-decl name='get_coverage' mangled-name='_ZN2OT15CoverageFormat14Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='677' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
                 <return type-id='type-id-74'/>
               </function-decl>
@@ -20552,7 +20539,7 @@
               <!-- bool OT::CoverageFormat1::Iter::more() -->
               <function-decl name='more' mangled-name='_ZN2OT15CoverageFormat14Iter4moreEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='674' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -20561,7 +20548,7 @@
               <!-- void OT::CoverageFormat1::Iter::init(const OT::CoverageFormat1&) -->
               <function-decl name='init' mangled-name='_ZN2OT15CoverageFormat14Iter4initERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::CoverageFormat1&' -->
                 <parameter type-id='type-id-1493'/>
                 <!-- void -->
@@ -20572,7 +20559,7 @@
               <!-- void OT::CoverageFormat1::Iter::next() -->
               <function-decl name='next' mangled-name='_ZN2OT15CoverageFormat14Iter4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='675' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -20581,7 +20568,7 @@
               <!-- uint16_t OT::CoverageFormat1::Iter::get_glyph() -->
               <function-decl name='get_glyph' mangled-name='_ZN2OT15CoverageFormat14Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='676' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
                 <return type-id='type-id-74'/>
               </function-decl>
@@ -20590,7 +20577,7 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CoverageFormat1::coverageFormat -->
-          <var-decl name='coverageFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='686' column='1'/>
+          <var-decl name='coverageFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='686' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::CoverageFormat1::glyphArray -->
@@ -20606,7 +20593,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
             <parameter type-id='type-id-1494' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20617,7 +20604,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
             <parameter type-id='type-id-1494' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20639,7 +20626,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
             <parameter type-id='type-id-1494' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -20650,9 +20637,9 @@
           <!-- bool OT::CoverageFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT15CoverageFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-549' is-artificial='yes'/>
+            <parameter type-id='type-id-547' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20663,7 +20650,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
             <parameter type-id='type-id-1494' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20672,11 +20659,11 @@
           <!-- bool OT::CoverageFormat1::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT15CoverageFormat19serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='640' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-549' is-artificial='yes'/>
+            <parameter type-id='type-id-547' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -20685,10 +20672,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CoverageFormat2 -->
-      <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-1128'>
+      <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-1126'>
         <member-type access='public'>
           <!-- struct OT::CoverageFormat2::Iter -->
-          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1129'>
+          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1127'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat2* OT::CoverageFormat2::Iter::c -->
               <var-decl name='c' type-id='type-id-1497' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
@@ -20709,7 +20696,7 @@
               <!-- uint16_t OT::CoverageFormat2::Iter::get_coverage() -->
               <function-decl name='get_coverage' mangled-name='_ZN2OT15CoverageFormat24Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
                 <return type-id='type-id-74'/>
               </function-decl>
@@ -20718,7 +20705,7 @@
               <!-- bool OT::CoverageFormat2::Iter::more() -->
               <function-decl name='more' mangled-name='_ZN2OT15CoverageFormat24Iter4moreEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='776' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -20727,7 +20714,7 @@
               <!-- void OT::CoverageFormat2::Iter::init(const OT::CoverageFormat2&) -->
               <function-decl name='init' mangled-name='_ZN2OT15CoverageFormat24Iter4initERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::CoverageFormat2&' -->
                 <parameter type-id='type-id-1496'/>
                 <!-- void -->
@@ -20738,7 +20725,7 @@
               <!-- void OT::CoverageFormat2::Iter::next() -->
               <function-decl name='next' mangled-name='_ZN2OT15CoverageFormat24Iter4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='777' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -20747,7 +20734,7 @@
               <!-- uint16_t OT::CoverageFormat2::Iter::get_glyph() -->
               <function-decl name='get_glyph' mangled-name='_ZN2OT15CoverageFormat24Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='787' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
                 <return type-id='type-id-74'/>
               </function-decl>
@@ -20756,7 +20743,7 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CoverageFormat2::coverageFormat -->
-          <var-decl name='coverageFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='797' column='1'/>
+          <var-decl name='coverageFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='797' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > OT::CoverageFormat2::rangeRecord -->
@@ -20772,7 +20759,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
             <parameter type-id='type-id-1497' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20783,7 +20770,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
             <parameter type-id='type-id-1497' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20805,7 +20792,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
             <parameter type-id='type-id-1497' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -20816,9 +20803,9 @@
           <!-- bool OT::CoverageFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT15CoverageFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-553' is-artificial='yes'/>
+            <parameter type-id='type-id-551' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20829,7 +20816,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
             <parameter type-id='type-id-1497' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20838,11 +20825,11 @@
           <!-- bool OT::CoverageFormat2::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT15CoverageFormat29serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='708' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-553' is-artificial='yes'/>
+            <parameter type-id='type-id-551' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -20851,20 +20838,20 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Coverage -->
-      <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-1122'>
+      <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-1120'>
         <member-type access='public'>
           <!-- struct OT::Coverage::Iter -->
-          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-1123'>
+          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-1121'>
             <member-type access='private'>
               <!-- union {OT::CoverageFormat1::Iter format1; OT::CoverageFormat2::Iter format2;} -->
-              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-1844'>
+              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-1842'>
                 <data-member access='public'>
                   <!-- OT::CoverageFormat1::Iter format1 -->
-                  <var-decl name='format1' type-id='type-id-1126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
+                  <var-decl name='format1' type-id='type-id-1124' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
                 <data-member access='public'>
                   <!-- OT::CoverageFormat2::Iter format2 -->
-                  <var-decl name='format2' type-id='type-id-1129' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
+                  <var-decl name='format2' type-id='type-id-1127' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
               </union-decl>
             </member-type>
@@ -20874,13 +20861,13 @@
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- union {OT::CoverageFormat1::Iter format1; OT::CoverageFormat2::Iter format2;} OT::Coverage::Iter::u -->
-              <var-decl name='u' type-id='type-id-1844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
+              <var-decl name='u' type-id='type-id-1842' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <!-- OT::Coverage::Iter::Iter() -->
               <function-decl name='Iter' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='873' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -20889,7 +20876,7 @@
               <!-- bool OT::Coverage::Iter::more() -->
               <function-decl name='more' mangled-name='_ZN2OT8Coverage4Iter4moreEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='882' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -20898,7 +20885,7 @@
               <!-- uint16_t OT::Coverage::Iter::get_coverage() -->
               <function-decl name='get_coverage' mangled-name='_ZN2OT8Coverage4Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='903' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
                 <return type-id='type-id-74'/>
               </function-decl>
@@ -20907,9 +20894,9 @@
               <!-- void OT::Coverage::Iter::init(const OT::Coverage&) -->
               <function-decl name='init' mangled-name='_ZN2OT8Coverage4Iter4initERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::Coverage&' -->
-                <parameter type-id='type-id-979'/>
+                <parameter type-id='type-id-977'/>
                 <!-- void -->
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -20918,7 +20905,7 @@
               <!-- void OT::Coverage::Iter::next() -->
               <function-decl name='next' mangled-name='_ZN2OT8Coverage4Iter4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='889' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -20927,7 +20914,7 @@
               <!-- uint16_t OT::Coverage::Iter::get_glyph() -->
               <function-decl name='get_glyph' mangled-name='_ZN2OT8Coverage4Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='896' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
                 <return type-id='type-id-74'/>
               </function-decl>
@@ -20936,24 +20923,24 @@
         </member-type>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::CoverageFormat1 format1; OT::CoverageFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-1845'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-1843'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CoverageFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1125' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='922' column='1'/>
+              <var-decl name='format1' type-id='type-id-1123' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='922' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CoverageFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='923' column='1'/>
+              <var-decl name='format2' type-id='type-id-1126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='923' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::CoverageFormat1 format1; OT::CoverageFormat2 format2;} OT::Coverage::u -->
-          <var-decl name='u' type-id='type-id-1845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
+          <var-decl name='u' type-id='type-id-1843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Coverage::min_size -->
@@ -20965,7 +20952,7 @@
             <!-- implicit parameter of type 'const OT::Coverage*' -->
             <parameter type-id='type-id-1491' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -20976,7 +20963,7 @@
             <!-- implicit parameter of type 'const OT::Coverage*' -->
             <parameter type-id='type-id-1491' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -21000,7 +20987,7 @@
             <!-- implicit parameter of type 'const OT::Coverage*' -->
             <parameter type-id='type-id-1491' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -21011,7 +20998,7 @@
             <!-- implicit parameter of type 'const OT::Coverage*' -->
             <parameter type-id='type-id-1491' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21020,9 +21007,9 @@
           <!-- bool OT::Coverage::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8Coverage8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='835' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Coverage*' -->
-            <parameter type-id='type-id-539' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21033,7 +21020,7 @@
             <!-- implicit parameter of type 'const OT::Coverage*' -->
             <parameter type-id='type-id-1491' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -21042,11 +21029,11 @@
           <!-- bool OT::Coverage::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT8Coverage9serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='817' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Coverage*' -->
-            <parameter type-id='type-id-539' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -21055,18 +21042,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ClassDefFormat1 -->
-      <class-decl name='ClassDefFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-1104'>
+      <class-decl name='ClassDefFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-1102'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ClassDefFormat1::classFormat -->
-          <var-decl name='classFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='981' column='1'/>
+          <var-decl name='classFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='981' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::GlyphID OT::ClassDefFormat1::startGlyph -->
-          <var-decl name='startGlyph' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
+          <var-decl name='startGlyph' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ClassDefFormat1::classValue -->
-          <var-decl name='classValue' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='984' column='1'/>
+          <var-decl name='classValue' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='984' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ClassDefFormat1::min_size -->
@@ -21076,9 +21063,9 @@
           <!-- void OT::ClassDefFormat1::add_class<hb_set_t>(hb_set_t*, unsigned int) -->
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='952' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat1*' -->
-            <parameter type-id='type-id-455' is-artificial='yes'/>
+            <parameter type-id='type-id-453' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -21089,7 +21076,7 @@
           <!-- unsigned int OT::ClassDefFormat1::get_class(hb_codepoint_t) -->
           <function-decl name='get_class' mangled-name='_ZNK2OT15ClassDefFormat19get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='939' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat1*' -->
-            <parameter type-id='type-id-455' is-artificial='yes'/>
+            <parameter type-id='type-id-453' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- unsigned int -->
@@ -21100,9 +21087,9 @@
           <!-- bool OT::ClassDefFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT15ClassDefFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='946' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ClassDefFormat1*' -->
-            <parameter type-id='type-id-1105' is-artificial='yes'/>
+            <parameter type-id='type-id-1103' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21111,9 +21098,9 @@
           <!-- bool OT::ClassDefFormat1::intersects_class(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_class' mangled-name='_ZNK2OT15ClassDefFormat116intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='959' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat1*' -->
-            <parameter type-id='type-id-455' is-artificial='yes'/>
+            <parameter type-id='type-id-453' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -21122,10 +21109,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ClassDefFormat2 -->
-      <class-decl name='ClassDefFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='990' column='1' id='type-id-1106'>
+      <class-decl name='ClassDefFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='990' column='1' id='type-id-1104'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ClassDefFormat2::classFormat -->
-          <var-decl name='classFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1040' column='1'/>
+          <var-decl name='classFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1040' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > OT::ClassDefFormat2::rangeRecord -->
@@ -21141,7 +21128,7 @@
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
             <parameter type-id='type-id-1479' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -21163,9 +21150,9 @@
           <!-- bool OT::ClassDefFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT15ClassDefFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1002' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ClassDefFormat2*' -->
-            <parameter type-id='type-id-1107' is-artificial='yes'/>
+            <parameter type-id='type-id-1105' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21176,7 +21163,7 @@
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
             <parameter type-id='type-id-1479' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -21185,27 +21172,27 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ClassDef -->
-      <class-decl name='ClassDef' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1049' column='1' id='type-id-1101'>
+      <class-decl name='ClassDef' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1049' column='1' id='type-id-1099'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ClassDefFormat1 format1; OT::ClassDefFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1086' column='1' id='type-id-1846'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1086' column='1' id='type-id-1844'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1087' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1087' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ClassDefFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
+              <var-decl name='format1' type-id='type-id-1102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ClassDefFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1089' column='1'/>
+              <var-decl name='format2' type-id='type-id-1104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1089' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ClassDefFormat1 format1; OT::ClassDefFormat2 format2;} OT::ClassDef::u -->
-          <var-decl name='u' type-id='type-id-1846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1090' column='1'/>
+          <var-decl name='u' type-id='type-id-1844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1090' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ClassDef::min_size -->
@@ -21215,9 +21202,9 @@
           <!-- bool OT::ClassDef::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8ClassDef8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1059' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ClassDef*' -->
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
+            <parameter type-id='type-id-1101' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21239,7 +21226,7 @@
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
             <parameter type-id='type-id-1476' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -21252,7 +21239,7 @@
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
             <parameter type-id='type-id-1476' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -21261,22 +21248,22 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Device -->
-      <class-decl name='Device' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-1135'>
+      <class-decl name='Device' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-1133'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::Device::startSize -->
-          <var-decl name='startSize' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1157' column='1'/>
+          <var-decl name='startSize' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1157' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::Device::endSize -->
-          <var-decl name='endSize' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1158' column='1'/>
+          <var-decl name='endSize' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1158' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::Device::deltaFormat -->
-          <var-decl name='deltaFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1159' column='1'/>
+          <var-decl name='deltaFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1159' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::Device::deltaValue[1] -->
-          <var-decl name='deltaValue' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
+          <var-decl name='deltaValue' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Device::min_size -->
@@ -21286,7 +21273,7 @@
           <!-- int OT::Device::get_delta_pixels(unsigned int) -->
           <function-decl name='get_delta_pixels' mangled-name='_ZNK2OT6Device16get_delta_pixelsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Device*' -->
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- int -->
@@ -21297,7 +21284,7 @@
           <!-- unsigned int OT::Device::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT6Device8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Device*' -->
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -21306,9 +21293,9 @@
           <!-- bool OT::Device::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT6Device8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1151' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Device*' -->
-            <parameter type-id='type-id-1137' is-artificial='yes'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21317,7 +21304,7 @@
           <!-- hb_position_t OT::Device::get_x_delta(hb_font_t*) -->
           <function-decl name='get_x_delta' mangled-name='_ZNK2OT6Device11get_x_deltaEP9hb_font_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Device*' -->
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
             <parameter type-id='type-id-147'/>
             <!-- typedef hb_position_t -->
@@ -21328,7 +21315,7 @@
           <!-- hb_position_t OT::Device::get_y_delta(hb_font_t*) -->
           <function-decl name='get_y_delta' mangled-name='_ZNK2OT6Device11get_y_deltaEP9hb_font_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Device*' -->
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
             <parameter type-id='type-id-147'/>
             <!-- typedef hb_position_t -->
@@ -21339,7 +21326,7 @@
           <!-- int OT::Device::get_delta(unsigned int, int) -->
           <function-decl name='get_delta' mangled-name='_ZNK2OT6Device9get_deltaEji' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Device*' -->
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'int' -->
@@ -21350,14 +21337,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::AttachList -->
-      <class-decl name='AttachList' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='48' column='1' id='type-id-1069'>
+      <class-decl name='AttachList' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='48' column='1' id='type-id-1067'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::AttachList::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='81' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='81' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetArrayOf<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > > OT::AttachList::attachPoint -->
-          <var-decl name='attachPoint' type-id='type-id-1826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='84' column='1'/>
+          <var-decl name='attachPoint' type-id='type-id-1824' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='84' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AttachList::min_size -->
@@ -21384,23 +21371,23 @@
           <!-- bool OT::AttachList::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT10AttachList8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::AttachList*' -->
-            <parameter type-id='type-id-1071' is-artificial='yes'/>
+            <parameter type-id='type-id-1069' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::CaretValueFormat1 -->
-      <class-decl name='CaretValueFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-1075'>
+      <class-decl name='CaretValueFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-1073'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat1::caretValueFormat -->
-          <var-decl name='caretValueFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='110' column='1'/>
+          <var-decl name='caretValueFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='110' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SHORT OT::CaretValueFormat1::coordinate -->
-          <var-decl name='coordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='111' column='1'/>
+          <var-decl name='coordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='111' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat1::static_size -->
@@ -21414,9 +21401,9 @@
           <!-- bool OT::CaretValueFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT17CaretValueFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CaretValueFormat1*' -->
-            <parameter type-id='type-id-1076' is-artificial='yes'/>
+            <parameter type-id='type-id-1074' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21425,7 +21412,7 @@
           <!-- hb_position_t OT::CaretValueFormat1::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat115get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CaretValueFormat1*' -->
-            <parameter type-id='type-id-447' is-artificial='yes'/>
+            <parameter type-id='type-id-445' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
             <parameter type-id='type-id-147'/>
             <!-- parameter of type 'enum hb_direction_t' -->
@@ -21438,14 +21425,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CaretValueFormat2 -->
-      <class-decl name='CaretValueFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-1077'>
+      <class-decl name='CaretValueFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-1075'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat2::caretValueFormat -->
-          <var-decl name='caretValueFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='136' column='1'/>
+          <var-decl name='caretValueFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='136' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::CaretValueFormat2::caretValuePoint -->
-          <var-decl name='caretValuePoint' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='137' column='1'/>
+          <var-decl name='caretValuePoint' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='137' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat2::static_size -->
@@ -21459,9 +21446,9 @@
           <!-- bool OT::CaretValueFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT17CaretValueFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CaretValueFormat2*' -->
-            <parameter type-id='type-id-1078' is-artificial='yes'/>
+            <parameter type-id='type-id-1076' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21470,7 +21457,7 @@
           <!-- hb_position_t OT::CaretValueFormat2::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat215get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CaretValueFormat2*' -->
-            <parameter type-id='type-id-448' is-artificial='yes'/>
+            <parameter type-id='type-id-446' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
             <parameter type-id='type-id-147'/>
             <!-- parameter of type 'enum hb_direction_t' -->
@@ -21483,18 +21470,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CaretValueFormat3 -->
-      <class-decl name='CaretValueFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-1079'>
+      <class-decl name='CaretValueFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-1077'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat3::caretValueFormat -->
-          <var-decl name='caretValueFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='159' column='1'/>
+          <var-decl name='caretValueFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='159' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SHORT OT::CaretValueFormat3::coordinate -->
-          <var-decl name='coordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='160' column='1'/>
+          <var-decl name='coordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='160' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > OT::CaretValueFormat3::deviceTable -->
-          <var-decl name='deviceTable' type-id='type-id-1234' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='162' column='1'/>
+          <var-decl name='deviceTable' type-id='type-id-1232' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='162' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat3::static_size -->
@@ -21508,9 +21495,9 @@
           <!-- bool OT::CaretValueFormat3::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT17CaretValueFormat38sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CaretValueFormat3*' -->
-            <parameter type-id='type-id-1080' is-artificial='yes'/>
+            <parameter type-id='type-id-1078' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21519,7 +21506,7 @@
           <!-- hb_position_t OT::CaretValueFormat3::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat315get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CaretValueFormat3*' -->
-            <parameter type-id='type-id-451' is-artificial='yes'/>
+            <parameter type-id='type-id-449' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
             <parameter type-id='type-id-147'/>
             <!-- parameter of type 'enum hb_direction_t' -->
@@ -21532,31 +21519,31 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CaretValue -->
-      <class-decl name='CaretValue' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='170' column='1' id='type-id-1072'>
+      <class-decl name='CaretValue' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='170' column='1' id='type-id-1070'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::CaretValueFormat1 format1; OT::CaretValueFormat2 format2; OT::CaretValueFormat3 format3;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='48' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='193' column='1' id='type-id-1847'>
+          <union-decl name='__anonymous_union__' size-in-bits='48' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='193' column='1' id='type-id-1845'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='194' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='194' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CaretValueFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1075' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
+              <var-decl name='format1' type-id='type-id-1073' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CaretValueFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1077' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
+              <var-decl name='format2' type-id='type-id-1075' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CaretValueFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
+              <var-decl name='format3' type-id='type-id-1077' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::CaretValueFormat1 format1; OT::CaretValueFormat2 format2; OT::CaretValueFormat3 format3;} OT::CaretValue::u -->
-          <var-decl name='u' type-id='type-id-1847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='198' column='1'/>
+          <var-decl name='u' type-id='type-id-1845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValue::min_size -->
@@ -21566,9 +21553,9 @@
           <!-- bool OT::CaretValue::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT10CaretValue8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CaretValue*' -->
-            <parameter type-id='type-id-1074' is-artificial='yes'/>
+            <parameter type-id='type-id-1072' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21590,10 +21577,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::LigGlyph -->
-      <class-decl name='LigGlyph' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='204' column='1' id='type-id-1175'>
+      <class-decl name='LigGlyph' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='204' column='1' id='type-id-1173'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetArrayOf<OT::CaretValue> OT::LigGlyph::carets -->
-          <var-decl name='carets' type-id='type-id-1827' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='229' column='1'/>
+          <var-decl name='carets' type-id='type-id-1825' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='229' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigGlyph::min_size -->
@@ -21603,9 +21590,9 @@
           <!-- bool OT::LigGlyph::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8LigGlyph8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LigGlyph*' -->
-            <parameter type-id='type-id-1177' is-artificial='yes'/>
+            <parameter type-id='type-id-1175' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21626,21 +21613,21 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::LigCaretList -->
-      <class-decl name='LigCaretList' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='237' column='1' id='type-id-1172'>
+      <class-decl name='LigCaretList' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='237' column='1' id='type-id-1170'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::LigCaretList::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='263' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='263' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetArrayOf<OT::LigGlyph> OT::LigCaretList::ligGlyph -->
-          <var-decl name='ligGlyph' type-id='type-id-1831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='266' column='1'/>
+          <var-decl name='ligGlyph' type-id='type-id-1829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='266' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigCaretList::min_size -->
@@ -21650,9 +21637,9 @@
           <!-- bool OT::LigCaretList::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12LigCaretList8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LigCaretList*' -->
-            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <parameter type-id='type-id-1172' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21673,21 +21660,21 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MarkGlyphSetsFormat1 -->
-      <class-decl name='MarkGlyphSetsFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='274' column='1' id='type-id-1196'>
+      <class-decl name='MarkGlyphSetsFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='274' column='1' id='type-id-1194'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkGlyphSetsFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='284' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='284' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > OT::MarkGlyphSetsFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-1037' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='286' column='1'/>
+          <var-decl name='coverage' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='286' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkGlyphSetsFormat1::min_size -->
@@ -21710,32 +21697,32 @@
           <!-- bool OT::MarkGlyphSetsFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT20MarkGlyphSetsFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkGlyphSetsFormat1*' -->
-            <parameter type-id='type-id-1197' is-artificial='yes'/>
+            <parameter type-id='type-id-1195' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MarkGlyphSets -->
-      <class-decl name='MarkGlyphSets' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='293' column='1' id='type-id-1193'>
+      <class-decl name='MarkGlyphSets' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='293' column='1' id='type-id-1191'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::MarkGlyphSetsFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='312' column='1' id='type-id-1848'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='312' column='1' id='type-id-1846'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='313' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='313' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MarkGlyphSetsFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1196' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='314' column='1'/>
+              <var-decl name='format1' type-id='type-id-1194' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='314' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::MarkGlyphSetsFormat1 format1;} OT::MarkGlyphSets::u -->
-          <var-decl name='u' type-id='type-id-1848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='315' column='1'/>
+          <var-decl name='u' type-id='type-id-1846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='315' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkGlyphSets::min_size -->
@@ -21758,19 +21745,19 @@
           <!-- bool OT::MarkGlyphSets::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT13MarkGlyphSets8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='302' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkGlyphSets*' -->
-            <parameter type-id='type-id-1195' is-artificial='yes'/>
+            <parameter type-id='type-id-1193' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::GDEF -->
-      <class-decl name='GDEF' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='326' column='1' id='type-id-1158'>
+      <class-decl name='GDEF' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='326' column='1' id='type-id-1156'>
         <member-type access='public'>
           <!-- enum OT::GDEF::GlyphClasses -->
-          <enum-decl name='GlyphClasses' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='329' column='1' id='type-id-1849'>
+          <enum-decl name='GlyphClasses' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='329' column='1' id='type-id-1847'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='UnclassifiedGlyph' value='0'/>
             <enumerator name='BaseGlyph' value='1'/>
@@ -21781,31 +21768,31 @@
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::GDEF::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='327' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='327' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::FixedVersion OT::GDEF::version -->
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='402' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='402' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::GDEF::glyphClassDef -->
-          <var-decl name='glyphClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='405' column='1'/>
+          <var-decl name='glyphClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='405' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > OT::GDEF::attachList -->
-          <var-decl name='attachList' type-id='type-id-1227' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='409' column='1'/>
+          <var-decl name='attachList' type-id='type-id-1225' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='409' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > OT::GDEF::ligCaretList -->
-          <var-decl name='ligCaretList' type-id='type-id-1239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='413' column='1'/>
+          <var-decl name='ligCaretList' type-id='type-id-1237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='413' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::GDEF::markAttachClassDef -->
-          <var-decl name='markAttachClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='417' column='1'/>
+          <var-decl name='markAttachClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='417' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > OT::GDEF::markGlyphSetsDef[1] -->
-          <var-decl name='markGlyphSetsDef' type-id='type-id-889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='421' column='1'/>
+          <var-decl name='markGlyphSetsDef' type-id='type-id-887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='421' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GDEF::min_size -->
@@ -21871,7 +21858,7 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -21901,7 +21888,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -21921,21 +21908,21 @@
           <!-- bool OT::GDEF::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4GDEF8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::GDEF*' -->
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-1157' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ValueFormat -->
-      <class-decl name='ValueFormat' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-1380'>
+      <class-decl name='ValueFormat' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-1378'>
         <!-- struct OT::IntType<short unsigned int, 2u> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-832'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-830'/>
         <member-type access='public'>
           <!-- enum OT::ValueFormat::Flags -->
-          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1850'>
+          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1848'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='xPlacement' value='1'/>
             <enumerator name='yPlacement' value='2'/>
@@ -21954,9 +21941,9 @@
           <!-- OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& OT::ValueFormat::get_device() -->
           <function-decl name='get_device' mangled-name='_ZN2OT11ValueFormat10get_deviceEPNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::Value*' -->
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <!-- OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1235'/>
+            <return type-id='type-id-1233'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -21999,13 +21986,13 @@
           <!-- bool OT::ValueFormat::sanitize_value(OT::hb_sanitize_context_t*, void*, OT::Value*) -->
           <function-decl name='sanitize_value' mangled-name='_ZN2OT11ValueFormat14sanitize_valueEPNS_21hb_sanitize_context_tEPvPNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ValueFormat*' -->
-            <parameter type-id='type-id-1381' is-artificial='yes'/>
+            <parameter type-id='type-id-1379' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'OT::Value*' -->
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22014,13 +22001,13 @@
           <!-- bool OT::ValueFormat::sanitize_values(OT::hb_sanitize_context_t*, void*, OT::Value*, unsigned int) -->
           <function-decl name='sanitize_values' mangled-name='_ZN2OT11ValueFormat15sanitize_valuesEPNS_21hb_sanitize_context_tEPvPNS_7IntTypeItLj2EEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ValueFormat*' -->
-            <parameter type-id='type-id-1381' is-artificial='yes'/>
+            <parameter type-id='type-id-1379' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'OT::Value*' -->
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -22031,13 +22018,13 @@
           <!-- bool OT::ValueFormat::sanitize_value_devices(OT::hb_sanitize_context_t*, void*, OT::Value*) -->
           <function-decl name='sanitize_value_devices' mangled-name='_ZN2OT11ValueFormat22sanitize_value_devicesEPNS_21hb_sanitize_context_tEPvPNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ValueFormat*' -->
-            <parameter type-id='type-id-1381' is-artificial='yes'/>
+            <parameter type-id='type-id-1379' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'OT::Value*' -->
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22055,13 +22042,13 @@
           <!-- bool OT::ValueFormat::sanitize_values_stride_unsafe(OT::hb_sanitize_context_t*, void*, OT::Value*, unsigned int, unsigned int) -->
           <function-decl name='sanitize_values_stride_unsafe' mangled-name='_ZN2OT11ValueFormat29sanitize_values_stride_unsafeEPNS_21hb_sanitize_context_tEPvPNS_7IntTypeItLj2EEEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ValueFormat*' -->
-            <parameter type-id='type-id-1381' is-artificial='yes'/>
+            <parameter type-id='type-id-1379' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- parameter of type 'OT::Value*' -->
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int' -->
@@ -22091,18 +22078,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::AnchorFormat1 -->
-      <class-decl name='AnchorFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-1005'>
+      <class-decl name='AnchorFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-1003'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='234' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='234' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SHORT OT::AnchorFormat1::xCoordinate -->
-          <var-decl name='xCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='235' column='1'/>
+          <var-decl name='xCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='235' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::SHORT OT::AnchorFormat1::yCoordinate -->
-          <var-decl name='yCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='236' column='1'/>
+          <var-decl name='yCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='236' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat1::static_size -->
@@ -22116,9 +22103,9 @@
           <!-- bool OT::AnchorFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT13AnchorFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::AnchorFormat1*' -->
-            <parameter type-id='type-id-1006' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22127,37 +22114,37 @@
           <!-- void OT::AnchorFormat1::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat110get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AnchorFormat1*' -->
-            <parameter type-id='type-id-515' is-artificial='yes'/>
+            <parameter type-id='type-id-513' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
             <parameter type-id='type-id-147'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::AnchorFormat2 -->
-      <class-decl name='AnchorFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-1007'>
+      <class-decl name='AnchorFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-1005'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat2::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='263' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='263' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SHORT OT::AnchorFormat2::xCoordinate -->
-          <var-decl name='xCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='264' column='1'/>
+          <var-decl name='xCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='264' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::SHORT OT::AnchorFormat2::yCoordinate -->
-          <var-decl name='yCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='265' column='1'/>
+          <var-decl name='yCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='265' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::AnchorFormat2::anchorPoint -->
-          <var-decl name='anchorPoint' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='266' column='1'/>
+          <var-decl name='anchorPoint' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='266' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat2::static_size -->
@@ -22171,9 +22158,9 @@
           <!-- bool OT::AnchorFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT13AnchorFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::AnchorFormat2*' -->
-            <parameter type-id='type-id-1008' is-artificial='yes'/>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22182,41 +22169,41 @@
           <!-- void OT::AnchorFormat2::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat210get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AnchorFormat2*' -->
-            <parameter type-id='type-id-516' is-artificial='yes'/>
+            <parameter type-id='type-id-514' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
             <parameter type-id='type-id-147'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::AnchorFormat3 -->
-      <class-decl name='AnchorFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-1009'>
+      <class-decl name='AnchorFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-1007'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat3::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='291' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='291' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SHORT OT::AnchorFormat3::xCoordinate -->
-          <var-decl name='xCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='292' column='1'/>
+          <var-decl name='xCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='292' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::SHORT OT::AnchorFormat3::yCoordinate -->
-          <var-decl name='yCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='293' column='1'/>
+          <var-decl name='yCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='293' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > OT::AnchorFormat3::xDeviceTable -->
-          <var-decl name='xDeviceTable' type-id='type-id-1234' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='295' column='1'/>
+          <var-decl name='xDeviceTable' type-id='type-id-1232' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='295' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > OT::AnchorFormat3::yDeviceTable -->
-          <var-decl name='yDeviceTable' type-id='type-id-1234' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='299' column='1'/>
+          <var-decl name='yDeviceTable' type-id='type-id-1232' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='299' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat3::static_size -->
@@ -22230,9 +22217,9 @@
           <!-- bool OT::AnchorFormat3::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT13AnchorFormat38sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='285' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::AnchorFormat3*' -->
-            <parameter type-id='type-id-1010' is-artificial='yes'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22241,46 +22228,46 @@
           <!-- void OT::AnchorFormat3::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat310get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AnchorFormat3*' -->
-            <parameter type-id='type-id-517' is-artificial='yes'/>
+            <parameter type-id='type-id-515' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
             <parameter type-id='type-id-147'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Anchor -->
-      <class-decl name='Anchor' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='307' column='1' id='type-id-1002'>
+      <class-decl name='Anchor' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='307' column='1' id='type-id-1000'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::AnchorFormat1 format1; OT::AnchorFormat2 format2; OT::AnchorFormat3 format3;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='332' column='1' id='type-id-1851'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='332' column='1' id='type-id-1849'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='333' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='333' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::AnchorFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1005' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
+              <var-decl name='format1' type-id='type-id-1003' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::AnchorFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
+              <var-decl name='format2' type-id='type-id-1005' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::AnchorFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-1009' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
+              <var-decl name='format3' type-id='type-id-1007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::AnchorFormat1 format1; OT::AnchorFormat2 format2; OT::AnchorFormat3 format3;} OT::Anchor::u -->
-          <var-decl name='u' type-id='type-id-1851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='337' column='1'/>
+          <var-decl name='u' type-id='type-id-1849' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='337' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Anchor::min_size -->
@@ -22290,9 +22277,9 @@
           <!-- bool OT::Anchor::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT6Anchor8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Anchor*' -->
-            <parameter type-id='type-id-1004' is-artificial='yes'/>
+            <parameter type-id='type-id-1002' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22307,23 +22294,23 @@
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-64'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::AnchorMatrix -->
-      <class-decl name='AnchorMatrix' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-1011'>
+      <class-decl name='AnchorMatrix' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-1009'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorMatrix::rows -->
-          <var-decl name='rows' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='363' column='1'/>
+          <var-decl name='rows' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='363' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > OT::AnchorMatrix::matrixZ[1] -->
-          <var-decl name='matrixZ' type-id='type-id-865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
+          <var-decl name='matrixZ' type-id='type-id-863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorMatrix::min_size -->
@@ -22333,9 +22320,9 @@
           <!-- bool OT::AnchorMatrix::sanitize(OT::hb_sanitize_context_t*, unsigned int) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12AnchorMatrix8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::AnchorMatrix*' -->
-            <parameter type-id='type-id-1013' is-artificial='yes'/>
+            <parameter type-id='type-id-1011' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -22346,7 +22333,7 @@
           <!-- const OT::Anchor& OT::AnchorMatrix::get_anchor(unsigned int, unsigned int, unsigned int, bool*) -->
           <function-decl name='get_anchor' mangled-name='_ZNK2OT12AnchorMatrix10get_anchorEjjjPb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AnchorMatrix*' -->
-            <parameter type-id='type-id-522' is-artificial='yes'/>
+            <parameter type-id='type-id-520' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int' -->
@@ -22361,14 +22348,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::MarkRecord -->
-      <class-decl name='MarkRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-860'>
+      <class-decl name='MarkRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-858'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkRecord::klass -->
-          <var-decl name='klass' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='383' column='1'/>
+          <var-decl name='klass' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='383' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > OT::MarkRecord::markAnchor -->
-          <var-decl name='markAnchor' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='385' column='1'/>
+          <var-decl name='markAnchor' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='385' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkRecord::static_size -->
@@ -22382,9 +22369,9 @@
           <!-- bool OT::MarkRecord::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT10MarkRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkRecord*' -->
-            <parameter type-id='type-id-1207' is-artificial='yes'/>
+            <parameter type-id='type-id-1205' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -22393,16 +22380,16 @@
         </member-function>
       </class-decl>
       <!-- struct OT::MarkArray -->
-      <class-decl name='MarkArray' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='392' column='1' id='type-id-1186'>
+      <class-decl name='MarkArray' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='392' column='1' id='type-id-1184'>
         <!-- struct OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1022'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1020'/>
         <member-function access='public'>
           <!-- bool OT::MarkArray::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9MarkArray8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkArray*' -->
-            <parameter type-id='type-id-1188' is-artificial='yes'/>
+            <parameter type-id='type-id-1186' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22413,7 +22400,7 @@
             <!-- implicit parameter of type 'const OT::MarkArray*' -->
             <parameter type-id='type-id-1567' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'unsigned int' -->
@@ -22430,22 +22417,22 @@
         </member-function>
       </class-decl>
       <!-- struct OT::SinglePosFormat1 -->
-      <class-decl name='SinglePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-1308'>
+      <class-decl name='SinglePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-1306'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::SinglePosFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='466' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='466' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::SinglePosFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='468' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='468' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::SinglePosFormat1::valueFormat -->
-          <var-decl name='valueFormat' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueRecord OT::SinglePosFormat1::values -->
-          <var-decl name='values' type-id='type-id-1852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
+          <var-decl name='values' type-id='type-id-1850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SinglePosFormat1::min_size -->
@@ -22455,18 +22442,18 @@
           <!-- const OT::Coverage& OT::SinglePosFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT16SinglePosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePosFormat1*' -->
-            <parameter type-id='type-id-529' is-artificial='yes'/>
+            <parameter type-id='type-id-527' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::SinglePosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT16SinglePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='435' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePosFormat1*' -->
-            <parameter type-id='type-id-529' is-artificial='yes'/>
+            <parameter type-id='type-id-527' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -22475,9 +22462,9 @@
           <!-- bool OT::SinglePosFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT16SinglePosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePosFormat1*' -->
-            <parameter type-id='type-id-529' is-artificial='yes'/>
+            <parameter type-id='type-id-527' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22486,35 +22473,35 @@
           <!-- bool OT::SinglePosFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT16SinglePosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SinglePosFormat1*' -->
-            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-1307' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SinglePosFormat2 -->
-      <class-decl name='SinglePosFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-1310'>
+      <class-decl name='SinglePosFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-1308'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::SinglePosFormat2::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='515' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='515' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::SinglePosFormat2::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='517' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='517' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::SinglePosFormat2::valueFormat -->
-          <var-decl name='valueFormat' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::SinglePosFormat2::valueCount -->
-          <var-decl name='valueCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='521' column='1'/>
+          <var-decl name='valueCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='521' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ValueRecord OT::SinglePosFormat2::values -->
-          <var-decl name='values' type-id='type-id-1852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
+          <var-decl name='values' type-id='type-id-1850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SinglePosFormat2::min_size -->
@@ -22524,18 +22511,18 @@
           <!-- const OT::Coverage& OT::SinglePosFormat2::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT16SinglePosFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='487' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePosFormat2*' -->
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::SinglePosFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT16SinglePosFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePosFormat2*' -->
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -22544,9 +22531,9 @@
           <!-- bool OT::SinglePosFormat2::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT16SinglePosFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePosFormat2*' -->
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22555,36 +22542,36 @@
           <!-- bool OT::SinglePosFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT16SinglePosFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='509' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SinglePosFormat2*' -->
-            <parameter type-id='type-id-1311' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SinglePos -->
-      <class-decl name='SinglePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='529' column='1' id='type-id-1306'>
+      <class-decl name='SinglePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='529' column='1' id='type-id-1304'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::SinglePosFormat1 format1; OT::SinglePosFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='552' column='1' id='type-id-1853'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='552' column='1' id='type-id-1851'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='553' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='553' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::SinglePosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1308' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
+              <var-decl name='format1' type-id='type-id-1306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::SinglePosFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1310' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
+              <var-decl name='format2' type-id='type-id-1308' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::SinglePosFormat1 format1; OT::SinglePosFormat2 format2;} OT::SinglePos::u -->
-          <var-decl name='u' type-id='type-id-1853' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='556' column='1'/>
+          <var-decl name='u' type-id='type-id-1851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='556' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::SinglePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -22592,9 +22579,9 @@
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
             <parameter type-id='type-id-1731' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22603,9 +22590,9 @@
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
             <parameter type-id='type-id-1731' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22614,35 +22601,35 @@
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
             <parameter type-id='type-id-1731' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::SinglePos::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9SinglePos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='541' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SinglePos*' -->
-            <parameter type-id='type-id-1307' is-artificial='yes'/>
+            <parameter type-id='type-id-1305' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::PairSet -->
-      <class-decl name='PairSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-1266'>
+      <class-decl name='PairSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-1264'>
         <member-type access='public'>
           <!-- struct OT::PairSet::sanitize_closure_t -->
-          <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-1269'>
+          <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-1267'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- void* OT::PairSet::sanitize_closure_t::base -->
               <var-decl name='base' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='628' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- OT::ValueFormat* OT::PairSet::sanitize_closure_t::valueFormats -->
-              <var-decl name='valueFormats' type-id='type-id-1381' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
+              <var-decl name='valueFormats' type-id='type-id-1379' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- unsigned int OT::PairSet::sanitize_closure_t::len1 -->
@@ -22656,11 +22643,11 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::PairSet::len -->
-          <var-decl name='len' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='646' column='1'/>
+          <var-decl name='len' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='646' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::PairSet::arrayZ[1] -->
-          <var-decl name='arrayZ' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
+          <var-decl name='arrayZ' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairSet::min_size -->
@@ -22670,9 +22657,9 @@
           <!-- bool OT::PairSet::sanitize(OT::hb_sanitize_context_t*, const OT::PairSet::sanitize_closure_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7PairSet8sanitizeEPNS_21hb_sanitize_context_tEPKNS0_18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::PairSet*' -->
-            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <parameter type-id='type-id-1266' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'const OT::PairSet::sanitize_closure_t*' -->
             <parameter type-id='type-id-1672'/>
             <!-- bool -->
@@ -22683,9 +22670,9 @@
           <!-- bool OT::PairSet::apply(OT::hb_apply_context_t*, const OT::ValueFormat*, unsigned int) -->
           <function-decl name='apply' mangled-name='_ZNK2OT7PairSet5applyEPNS_18hb_apply_context_tEPKNS_11ValueFormatEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairSet*' -->
-            <parameter type-id='type-id-512' is-artificial='yes'/>
+            <parameter type-id='type-id-510' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'const OT::ValueFormat*' -->
             <parameter type-id='type-id-1768'/>
             <!-- parameter of type 'unsigned int' -->
@@ -22698,9 +22685,9 @@
           <!-- void OT::PairSet::collect_glyphs(OT::hb_collect_glyphs_context_t*, const OT::ValueFormat*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT7PairSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tEPKNS_11ValueFormatE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairSet*' -->
-            <parameter type-id='type-id-512' is-artificial='yes'/>
+            <parameter type-id='type-id-510' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- parameter of type 'const OT::ValueFormat*' -->
             <parameter type-id='type-id-1768'/>
             <!-- void -->
@@ -22709,26 +22696,26 @@
         </member-function>
       </class-decl>
       <!-- struct OT::PairPosFormat1 -->
-      <class-decl name='PairPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-1262'>
+      <class-decl name='PairPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-1260'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::PairPosFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='700' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='700' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::PairPosFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='702' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='702' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::PairPosFormat1::valueFormat1 -->
-          <var-decl name='valueFormat1' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueFormat OT::PairPosFormat1::valueFormat2 -->
-          <var-decl name='valueFormat2' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetArrayOf<OT::PairSet> OT::PairPosFormat1::pairSet -->
-          <var-decl name='pairSet' type-id='type-id-1835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
+          <var-decl name='pairSet' type-id='type-id-1833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairPosFormat1::min_size -->
@@ -22738,18 +22725,18 @@
           <!-- const OT::Coverage& OT::PairPosFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14PairPosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPosFormat1*' -->
-            <parameter type-id='type-id-531' is-artificial='yes'/>
+            <parameter type-id='type-id-529' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::PairPosFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT14PairPosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='669' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPosFormat1*' -->
-            <parameter type-id='type-id-531' is-artificial='yes'/>
+            <parameter type-id='type-id-529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22758,9 +22745,9 @@
           <!-- void OT::PairPosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14PairPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='655' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPosFormat1*' -->
-            <parameter type-id='type-id-531' is-artificial='yes'/>
+            <parameter type-id='type-id-529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -22769,51 +22756,51 @@
           <!-- bool OT::PairPosFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT14PairPosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::PairPosFormat1*' -->
-            <parameter type-id='type-id-1263' is-artificial='yes'/>
+            <parameter type-id='type-id-1261' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::PairPosFormat2 -->
-      <class-decl name='PairPosFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-1264'>
+      <class-decl name='PairPosFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-1262'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::PairPosFormat2::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='791' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='791' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::PairPosFormat2::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='793' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='793' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::PairPosFormat2::valueFormat1 -->
-          <var-decl name='valueFormat1' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueFormat OT::PairPosFormat2::valueFormat2 -->
-          <var-decl name='valueFormat2' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::PairPosFormat2::classDef1 -->
-          <var-decl name='classDef1' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='802' column='1'/>
+          <var-decl name='classDef1' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='802' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::PairPosFormat2::classDef2 -->
-          <var-decl name='classDef2' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='806' column='1'/>
+          <var-decl name='classDef2' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='806' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::USHORT OT::PairPosFormat2::class1Count -->
-          <var-decl name='class1Count' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='809' column='1'/>
+          <var-decl name='class1Count' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='809' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
           <!-- OT::USHORT OT::PairPosFormat2::class2Count -->
-          <var-decl name='class2Count' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='811' column='1'/>
+          <var-decl name='class2Count' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='811' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <!-- OT::ValueRecord OT::PairPosFormat2::values -->
-          <var-decl name='values' type-id='type-id-1852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
+          <var-decl name='values' type-id='type-id-1850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairPosFormat2::min_size -->
@@ -22823,18 +22810,18 @@
           <!-- const OT::Coverage& OT::PairPosFormat2::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14PairPosFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPosFormat2*' -->
-            <parameter type-id='type-id-532' is-artificial='yes'/>
+            <parameter type-id='type-id-530' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::PairPosFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14PairPosFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='719' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPosFormat2*' -->
-            <parameter type-id='type-id-532' is-artificial='yes'/>
+            <parameter type-id='type-id-530' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -22843,9 +22830,9 @@
           <!-- bool OT::PairPosFormat2::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT14PairPosFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPosFormat2*' -->
-            <parameter type-id='type-id-532' is-artificial='yes'/>
+            <parameter type-id='type-id-530' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22854,36 +22841,36 @@
           <!-- bool OT::PairPosFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT14PairPosFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::PairPosFormat2*' -->
-            <parameter type-id='type-id-1265' is-artificial='yes'/>
+            <parameter type-id='type-id-1263' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::PairPos -->
-      <class-decl name='PairPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='821' column='1' id='type-id-1260'>
+      <class-decl name='PairPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='821' column='1' id='type-id-1258'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::PairPosFormat1 format1; OT::PairPosFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='144' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='844' column='1' id='type-id-1857'>
+          <union-decl name='__anonymous_union__' size-in-bits='144' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='844' column='1' id='type-id-1855'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='845' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='845' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::PairPosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1262' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
+              <var-decl name='format1' type-id='type-id-1260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::PairPosFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1264' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
+              <var-decl name='format2' type-id='type-id-1262' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::PairPosFormat1 format1; OT::PairPosFormat2 format2;} OT::PairPos::u -->
-          <var-decl name='u' type-id='type-id-1857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='848' column='1'/>
+          <var-decl name='u' type-id='type-id-1855' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='848' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::PairPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -22891,9 +22878,9 @@
             <!-- implicit parameter of type 'const OT::PairPos*' -->
             <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22902,9 +22889,9 @@
             <!-- implicit parameter of type 'const OT::PairPos*' -->
             <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22913,32 +22900,32 @@
             <!-- implicit parameter of type 'const OT::PairPos*' -->
             <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::PairPos::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7PairPos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='833' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::PairPos*' -->
-            <parameter type-id='type-id-1261' is-artificial='yes'/>
+            <parameter type-id='type-id-1259' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::EntryExitRecord -->
-      <class-decl name='EntryExitRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='853' column='1' id='type-id-853'>
+      <class-decl name='EntryExitRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='853' column='1' id='type-id-851'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > OT::EntryExitRecord::entryAnchor -->
-          <var-decl name='entryAnchor' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='863' column='1'/>
+          <var-decl name='entryAnchor' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='863' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > OT::EntryExitRecord::exitAnchor -->
-          <var-decl name='exitAnchor' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='867' column='1'/>
+          <var-decl name='exitAnchor' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='867' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::EntryExitRecord::static_size -->
@@ -22952,9 +22939,9 @@
           <!-- bool OT::EntryExitRecord::sanitize(OT::hb_sanitize_context_t*, void*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT15EntryExitRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::EntryExitRecord*' -->
-            <parameter type-id='type-id-1139' is-artificial='yes'/>
+            <parameter type-id='type-id-1137' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-17'/>
             <!-- bool -->
@@ -22963,18 +22950,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::CursivePosFormat1 -->
-      <class-decl name='CursivePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1133'>
+      <class-decl name='CursivePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1131'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CursivePosFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='976' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='976' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::CursivePosFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='978' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='978' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > OT::CursivePosFormat1::entryExitRecord -->
-          <var-decl name='entryExitRecord' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
+          <var-decl name='entryExitRecord' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CursivePosFormat1::min_size -->
@@ -22986,7 +22973,7 @@
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
             <parameter type-id='type-id-1502' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22995,7 +22982,7 @@
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
             <parameter type-id='type-id-1502' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23004,9 +22991,9 @@
           <!-- bool OT::CursivePosFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT17CursivePosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='970' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CursivePosFormat1*' -->
-            <parameter type-id='type-id-1134' is-artificial='yes'/>
+            <parameter type-id='type-id-1132' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23017,30 +23004,30 @@
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
             <parameter type-id='type-id-1502' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::CursivePos -->
-      <class-decl name='CursivePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='988' column='1' id='type-id-1131'>
+      <class-decl name='CursivePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='988' column='1' id='type-id-1129'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::CursivePosFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1009' column='1' id='type-id-1858'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1009' column='1' id='type-id-1856'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1010' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1010' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CursivePosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1133' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
+              <var-decl name='format1' type-id='type-id-1131' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::CursivePosFormat1 format1;} OT::CursivePos::u -->
-          <var-decl name='u' type-id='type-id-1858' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1012' column='1'/>
+          <var-decl name='u' type-id='type-id-1856' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1012' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::CursivePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -23048,9 +23035,9 @@
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
             <parameter type-id='type-id-1499' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23059,9 +23046,9 @@
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
             <parameter type-id='type-id-1499' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23070,48 +23057,48 @@
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
             <parameter type-id='type-id-1499' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::CursivePos::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT10CursivePos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='999' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::CursivePos*' -->
-            <parameter type-id='type-id-1132' is-artificial='yes'/>
+            <parameter type-id='type-id-1130' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MarkBasePosFormat1 -->
-      <class-decl name='MarkBasePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-1191'>
+      <class-decl name='MarkBasePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-1189'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkBasePosFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1068' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1068' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::MarkBasePosFormat1::markCoverage -->
-          <var-decl name='markCoverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1070' column='1'/>
+          <var-decl name='markCoverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1070' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::MarkBasePosFormat1::baseCoverage -->
-          <var-decl name='baseCoverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1073' column='1'/>
+          <var-decl name='baseCoverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1073' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::MarkBasePosFormat1::classCount -->
-          <var-decl name='classCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1075' column='1'/>
+          <var-decl name='classCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1075' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > OT::MarkBasePosFormat1::markArray -->
-          <var-decl name='markArray' type-id='type-id-1244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1077' column='1'/>
+          <var-decl name='markArray' type-id='type-id-1242' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1077' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > OT::MarkBasePosFormat1::baseArray -->
-          <var-decl name='baseArray' type-id='type-id-866' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1080' column='1'/>
+          <var-decl name='baseArray' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1080' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkBasePosFormat1::static_size -->
@@ -23125,18 +23112,18 @@
           <!-- const OT::Coverage& OT::MarkBasePosFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18MarkBasePosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1030' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePosFormat1*' -->
-            <parameter type-id='type-id-524' is-artificial='yes'/>
+            <parameter type-id='type-id-522' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::MarkBasePosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18MarkBasePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1023' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePosFormat1*' -->
-            <parameter type-id='type-id-524' is-artificial='yes'/>
+            <parameter type-id='type-id-522' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23145,9 +23132,9 @@
           <!-- bool OT::MarkBasePosFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT18MarkBasePosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1061' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkBasePosFormat1*' -->
-            <parameter type-id='type-id-1192' is-artificial='yes'/>
+            <parameter type-id='type-id-1190' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23156,32 +23143,32 @@
           <!-- bool OT::MarkBasePosFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT18MarkBasePosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1035' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePosFormat1*' -->
-            <parameter type-id='type-id-524' is-artificial='yes'/>
+            <parameter type-id='type-id-522' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MarkBasePos -->
-      <class-decl name='MarkBasePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1087' column='1' id='type-id-1189'>
+      <class-decl name='MarkBasePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1087' column='1' id='type-id-1187'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::MarkBasePosFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1108' column='1' id='type-id-1859'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1108' column='1' id='type-id-1857'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1109' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1109' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MarkBasePosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1191' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
+              <var-decl name='format1' type-id='type-id-1189' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::MarkBasePosFormat1 format1;} OT::MarkBasePos::u -->
-          <var-decl name='u' type-id='type-id-1859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1111' column='1'/>
+          <var-decl name='u' type-id='type-id-1857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1111' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkBasePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -23189,9 +23176,9 @@
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
             <parameter type-id='type-id-1569' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23200,9 +23187,9 @@
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
             <parameter type-id='type-id-1569' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23211,48 +23198,48 @@
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
             <parameter type-id='type-id-1569' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::MarkBasePos::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT11MarkBasePos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1098' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkBasePos*' -->
-            <parameter type-id='type-id-1190' is-artificial='yes'/>
+            <parameter type-id='type-id-1188' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MarkLigPosFormat1 -->
-      <class-decl name='MarkLigPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-1200'>
+      <class-decl name='MarkLigPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-1198'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkLigPosFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1188' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1188' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::MarkLigPosFormat1::markCoverage -->
-          <var-decl name='markCoverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1190' column='1'/>
+          <var-decl name='markCoverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1190' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::MarkLigPosFormat1::ligatureCoverage -->
-          <var-decl name='ligatureCoverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1193' column='1'/>
+          <var-decl name='ligatureCoverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1193' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::MarkLigPosFormat1::classCount -->
-          <var-decl name='classCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1196' column='1'/>
+          <var-decl name='classCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1196' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > OT::MarkLigPosFormat1::markArray -->
-          <var-decl name='markArray' type-id='type-id-1244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1198' column='1'/>
+          <var-decl name='markArray' type-id='type-id-1242' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1198' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > OT::MarkLigPosFormat1::ligatureArray -->
-          <var-decl name='ligatureArray' type-id='type-id-1245' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1201' column='1'/>
+          <var-decl name='ligatureArray' type-id='type-id-1243' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1201' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkLigPosFormat1::static_size -->
@@ -23266,18 +23253,18 @@
           <!-- const OT::Coverage& OT::MarkLigPosFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT17MarkLigPosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPosFormat1*' -->
-            <parameter type-id='type-id-527' is-artificial='yes'/>
+            <parameter type-id='type-id-525' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::MarkLigPosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17MarkLigPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPosFormat1*' -->
-            <parameter type-id='type-id-527' is-artificial='yes'/>
+            <parameter type-id='type-id-525' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23286,9 +23273,9 @@
           <!-- bool OT::MarkLigPosFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT17MarkLigPosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkLigPosFormat1*' -->
-            <parameter type-id='type-id-1201' is-artificial='yes'/>
+            <parameter type-id='type-id-1199' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23297,32 +23284,32 @@
           <!-- bool OT::MarkLigPosFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT17MarkLigPosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPosFormat1*' -->
-            <parameter type-id='type-id-527' is-artificial='yes'/>
+            <parameter type-id='type-id-525' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MarkLigPos -->
-      <class-decl name='MarkLigPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1208' column='1' id='type-id-1198'>
+      <class-decl name='MarkLigPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1208' column='1' id='type-id-1196'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::MarkLigPosFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1229' column='1' id='type-id-1860'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1229' column='1' id='type-id-1858'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1230' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1230' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MarkLigPosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1200' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
+              <var-decl name='format1' type-id='type-id-1198' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::MarkLigPosFormat1 format1;} OT::MarkLigPos::u -->
-          <var-decl name='u' type-id='type-id-1860' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1232' column='1'/>
+          <var-decl name='u' type-id='type-id-1858' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1232' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkLigPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -23330,9 +23317,9 @@
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
             <parameter type-id='type-id-1578' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23341,9 +23328,9 @@
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
             <parameter type-id='type-id-1578' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23352,48 +23339,48 @@
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
             <parameter type-id='type-id-1578' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::MarkLigPos::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT10MarkLigPos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1219' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkLigPos*' -->
-            <parameter type-id='type-id-1199' is-artificial='yes'/>
+            <parameter type-id='type-id-1197' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MarkMarkPosFormat1 -->
-      <class-decl name='MarkMarkPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-1204'>
+      <class-decl name='MarkMarkPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-1202'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkMarkPosFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1306' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1306' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::MarkMarkPosFormat1::mark1Coverage -->
-          <var-decl name='mark1Coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1308' column='1'/>
+          <var-decl name='mark1Coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1308' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::MarkMarkPosFormat1::mark2Coverage -->
-          <var-decl name='mark2Coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1312' column='1'/>
+          <var-decl name='mark2Coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1312' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::MarkMarkPosFormat1::classCount -->
-          <var-decl name='classCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1315' column='1'/>
+          <var-decl name='classCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1315' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > OT::MarkMarkPosFormat1::mark1Array -->
-          <var-decl name='mark1Array' type-id='type-id-1244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1317' column='1'/>
+          <var-decl name='mark1Array' type-id='type-id-1242' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1317' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > OT::MarkMarkPosFormat1::mark2Array -->
-          <var-decl name='mark2Array' type-id='type-id-866' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1320' column='1'/>
+          <var-decl name='mark2Array' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1320' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkMarkPosFormat1::static_size -->
@@ -23407,18 +23394,18 @@
           <!-- const OT::Coverage& OT::MarkMarkPosFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18MarkMarkPosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1250' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPosFormat1*' -->
-            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-526' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::MarkMarkPosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18MarkMarkPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1243' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPosFormat1*' -->
-            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-526' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23427,9 +23414,9 @@
           <!-- bool OT::MarkMarkPosFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT18MarkMarkPosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1298' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkMarkPosFormat1*' -->
-            <parameter type-id='type-id-1205' is-artificial='yes'/>
+            <parameter type-id='type-id-1203' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23438,32 +23425,32 @@
           <!-- bool OT::MarkMarkPosFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT18MarkMarkPosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1255' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPosFormat1*' -->
-            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-526' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MarkMarkPos -->
-      <class-decl name='MarkMarkPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1327' column='1' id='type-id-1202'>
+      <class-decl name='MarkMarkPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1327' column='1' id='type-id-1200'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::MarkMarkPosFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1348' column='1' id='type-id-1861'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1348' column='1' id='type-id-1859'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1349' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1349' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MarkMarkPosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
+              <var-decl name='format1' type-id='type-id-1202' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::MarkMarkPosFormat1 format1;} OT::MarkMarkPos::u -->
-          <var-decl name='u' type-id='type-id-1861' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1351' column='1'/>
+          <var-decl name='u' type-id='type-id-1859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1351' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkMarkPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -23471,9 +23458,9 @@
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
             <parameter type-id='type-id-1582' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23482,9 +23469,9 @@
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
             <parameter type-id='type-id-1582' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23493,43 +23480,43 @@
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
             <parameter type-id='type-id-1582' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::MarkMarkPos::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT11MarkMarkPos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1338' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MarkMarkPos*' -->
-            <parameter type-id='type-id-1203' is-artificial='yes'/>
+            <parameter type-id='type-id-1201' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ContextPos -->
-      <class-decl name='ContextPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1355' column='1' id='type-id-1862'>
+      <class-decl name='ContextPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1355' column='1' id='type-id-1860'>
         <!-- struct OT::Context -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1108'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1106'/>
       </class-decl>
       <!-- struct OT::ChainContextPos -->
-      <class-decl name='ChainContextPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1357' column='1' id='type-id-1863'>
+      <class-decl name='ChainContextPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1357' column='1' id='type-id-1861'>
         <!-- struct OT::ChainContext -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1081'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1079'/>
       </class-decl>
       <!-- struct OT::ExtensionPos -->
-      <class-decl name='ExtensionPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1360' column='1' id='type-id-1864'>
+      <class-decl name='ExtensionPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1360' column='1' id='type-id-1862'>
         <!-- struct OT::Extension<OT::ExtensionPos> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1140'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1138'/>
       </class-decl>
       <!-- struct OT::PosLookupSubTable -->
-      <class-decl name='PosLookupSubTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1372' column='1' id='type-id-1273'>
+      <class-decl name='PosLookupSubTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1372' column='1' id='type-id-1271'>
         <member-type access='public'>
           <!-- enum OT::PosLookupSubTable::Type -->
-          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1375' column='1' id='type-id-1865'>
+          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1375' column='1' id='type-id-1863'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='Single' value='1'/>
             <enumerator name='Pair' value='2'/>
@@ -23544,52 +23531,52 @@
         </member-type>
         <member-type access='protected'>
           <!-- union {struct {OT::USHORT sub_format;} header; OT::SinglePos single; OT::PairPos pair; OT::CursivePos cursive; OT::MarkBasePos markBase; OT::MarkLigPos markLig; OT::MarkMarkPos markMark; OT::ContextPos context; OT::ChainContextPos chainContext; OT::ExtensionPos extension;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1424' column='1' id='type-id-1866'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1424' column='1' id='type-id-1864'>
             <data-member access='public'>
               <!-- struct {OT::USHORT sub_format;} header -->
-              <var-decl name='header' type-id='type-id-1867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1427' column='1'/>
+              <var-decl name='header' type-id='type-id-1865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1427' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::SinglePos single -->
-              <var-decl name='single' type-id='type-id-1306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1428' column='1'/>
+              <var-decl name='single' type-id='type-id-1304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1428' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::PairPos pair -->
-              <var-decl name='pair' type-id='type-id-1260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1429' column='1'/>
+              <var-decl name='pair' type-id='type-id-1258' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1429' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::CursivePos cursive -->
-              <var-decl name='cursive' type-id='type-id-1131' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1430' column='1'/>
+              <var-decl name='cursive' type-id='type-id-1129' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1430' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MarkBasePos markBase -->
-              <var-decl name='markBase' type-id='type-id-1189' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1431' column='1'/>
+              <var-decl name='markBase' type-id='type-id-1187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1431' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MarkLigPos markLig -->
-              <var-decl name='markLig' type-id='type-id-1198' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1432' column='1'/>
+              <var-decl name='markLig' type-id='type-id-1196' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1432' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MarkMarkPos markMark -->
-              <var-decl name='markMark' type-id='type-id-1202' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1433' column='1'/>
+              <var-decl name='markMark' type-id='type-id-1200' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1433' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ContextPos context -->
-              <var-decl name='context' type-id='type-id-1862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1434' column='1'/>
+              <var-decl name='context' type-id='type-id-1860' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1434' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ChainContextPos chainContext -->
-              <var-decl name='chainContext' type-id='type-id-1863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1435' column='1'/>
+              <var-decl name='chainContext' type-id='type-id-1861' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1435' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ExtensionPos extension -->
-              <var-decl name='extension' type-id='type-id-1864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1436' column='1'/>
+              <var-decl name='extension' type-id='type-id-1862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1436' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {struct {OT::USHORT sub_format;} header; OT::SinglePos single; OT::PairPos pair; OT::CursivePos cursive; OT::MarkBasePos markBase; OT::MarkLigPos markLig; OT::MarkMarkPos markMark; OT::ContextPos context; OT::ChainContextPos chainContext; OT::ExtensionPos extension;} OT::PosLookupSubTable::u -->
-          <var-decl name='u' type-id='type-id-1866' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1437' column='1'/>
+          <var-decl name='u' type-id='type-id-1864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PosLookupSubTable::min_size -->
@@ -23601,11 +23588,11 @@
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
             <parameter type-id='type-id-1677' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23614,11 +23601,11 @@
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
             <parameter type-id='type-id-1677' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23627,20 +23614,20 @@
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
             <parameter type-id='type-id-1677' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::PosLookupSubTable::sanitize(OT::hb_sanitize_context_t*, unsigned int) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT17PosLookupSubTable8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1405' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::PosLookupSubTable*' -->
-            <parameter type-id='type-id-1275' is-artificial='yes'/>
+            <parameter type-id='type-id-1273' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -23649,16 +23636,16 @@
         </member-function>
       </class-decl>
       <!-- struct OT::PosLookup -->
-      <class-decl name='PosLookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1444' column='1' id='type-id-945'>
+      <class-decl name='PosLookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1444' column='1' id='type-id-943'>
         <!-- struct OT::Lookup -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1183'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1181'/>
         <member-function access='public'>
           <!-- void OT::PosLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1461' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
             <parameter type-id='type-id-1674' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23669,9 +23656,9 @@
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
             <parameter type-id='type-id-1674' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23680,9 +23667,9 @@
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
             <parameter type-id='type-id-1674' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23711,7 +23698,7 @@
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
             <parameter type-id='type-id-1674' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23720,9 +23707,9 @@
           <!-- bool OT::PosLookup::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9PosLookup8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1502' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::PosLookup*' -->
-            <parameter type-id='type-id-1272' is-artificial='yes'/>
+            <parameter type-id='type-id-1270' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23733,16 +23720,16 @@
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
             <parameter type-id='type-id-1674' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <!-- bool OT::PosLookup::apply_recurse_func(unsigned int) -->
           <function-decl name='apply_recurse_func' mangled-name='_ZN2OT9PosLookup18apply_recurse_funcEPNS_18hb_apply_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1483' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -23751,12 +23738,12 @@
         </member-function>
       </class-decl>
       <!-- struct OT::GPOS -->
-      <class-decl name='GPOS' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1517' column='1' id='type-id-1160'>
+      <class-decl name='GPOS' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1517' column='1' id='type-id-1158'>
         <!-- struct OT::GSUBGPOS -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1164'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1162'/>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::GPOS::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1518' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1518' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GPOS::static_size -->
@@ -23796,34 +23783,34 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::PosLookup& -->
-            <return type-id='type-id-934'/>
+            <return type-id='type-id-932'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::GPOS::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4GPOS8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::GPOS*' -->
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-1159' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SingleSubstFormat1 -->
-      <class-decl name='SingleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='39' column='1' id='type-id-1314'>
+      <class-decl name='SingleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='39' column='1' id='type-id-1312'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::SingleSubstFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='106' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='106' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::SingleSubstFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='108' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='108' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::SHORT OT::SingleSubstFormat1::deltaGlyphID -->
-          <var-decl name='deltaGlyphID' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='110' column='1'/>
+          <var-decl name='deltaGlyphID' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='110' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SingleSubstFormat1::static_size -->
@@ -23839,7 +23826,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
             <parameter type-id='type-id-1740' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23850,7 +23837,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
             <parameter type-id='type-id-1740' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23859,7 +23846,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
             <parameter type-id='type-id-1740' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23870,7 +23857,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
             <parameter type-id='type-id-1740' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23879,9 +23866,9 @@
           <!-- bool OT::SingleSubstFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT18SingleSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-548' is-artificial='yes'/>
+            <parameter type-id='type-id-546' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23892,7 +23879,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
             <parameter type-id='type-id-1740' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23901,11 +23888,11 @@
           <!-- bool OT::SingleSubstFormat1::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int, int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT18SingleSubstFormat19serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEEji' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-548' is-artificial='yes'/>
+            <parameter type-id='type-id-546' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'int' -->
@@ -23916,18 +23903,18 @@
         </member-function>
       </class-decl>
       <!-- struct OT::SingleSubstFormat2 -->
-      <class-decl name='SingleSubstFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='117' column='1' id='type-id-1315'>
+      <class-decl name='SingleSubstFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='117' column='1' id='type-id-1313'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::SingleSubstFormat2::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='182' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='182' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::SingleSubstFormat2::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='184' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='184' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::SingleSubstFormat2::substitute -->
-          <var-decl name='substitute' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='187' column='1'/>
+          <var-decl name='substitute' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='187' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SingleSubstFormat2::min_size -->
@@ -23939,7 +23926,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
             <parameter type-id='type-id-1743' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23950,7 +23937,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
             <parameter type-id='type-id-1743' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23959,7 +23946,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
             <parameter type-id='type-id-1743' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23970,7 +23957,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
             <parameter type-id='type-id-1743' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -23979,9 +23966,9 @@
           <!-- bool OT::SingleSubstFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT18SingleSubstFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-559' is-artificial='yes'/>
+            <parameter type-id='type-id-557' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -23992,7 +23979,7 @@
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
             <parameter type-id='type-id-1743' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24001,13 +23988,13 @@
           <!-- bool OT::SingleSubstFormat2::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT18SingleSubstFormat29serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEES7_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-559' is-artificial='yes'/>
+            <parameter type-id='type-id-557' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -24016,27 +24003,27 @@
         </member-function>
       </class-decl>
       <!-- struct OT::SingleSubst -->
-      <class-decl name='SingleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-1312'>
+      <class-decl name='SingleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-1310'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::SingleSubstFormat1 format1; OT::SingleSubstFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-1868'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-1866'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::SingleSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1314' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='246' column='1'/>
+              <var-decl name='format1' type-id='type-id-1312' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='246' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::SingleSubstFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1315' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='247' column='1'/>
+              <var-decl name='format2' type-id='type-id-1313' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='247' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::SingleSubstFormat1 format1; OT::SingleSubstFormat2 format2;} OT::SingleSubst::u -->
-          <var-decl name='u' type-id='type-id-1868' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
+          <var-decl name='u' type-id='type-id-1866' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::SingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -24044,9 +24031,9 @@
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
             <parameter type-id='type-id-1737' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24055,9 +24042,9 @@
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
             <parameter type-id='type-id-1737' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24066,9 +24053,9 @@
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
             <parameter type-id='type-id-1737' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24077,9 +24064,9 @@
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
             <parameter type-id='type-id-1737' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24088,18 +24075,18 @@
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
             <parameter type-id='type-id-1737' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::SingleSubst::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT11SingleSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SingleSubst*' -->
-            <parameter type-id='type-id-1313' is-artificial='yes'/>
+            <parameter type-id='type-id-1311' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24110,22 +24097,22 @@
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
             <parameter type-id='type-id-1737' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::SingleSubst::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT11SingleSubst9serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEES7_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SingleSubst*' -->
-            <parameter type-id='type-id-1313' is-artificial='yes'/>
+            <parameter type-id='type-id-1311' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -24134,10 +24121,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Sequence -->
-      <class-decl name='Sequence' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='253' column='1' id='type-id-1303'>
+      <class-decl name='Sequence' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='253' column='1' id='type-id-1301'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::Sequence::substitute -->
-          <var-decl name='substitute' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='322' column='1'/>
+          <var-decl name='substitute' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='322' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Sequence::min_size -->
@@ -24149,7 +24136,7 @@
             <!-- implicit parameter of type 'const OT::Sequence*' -->
             <parameter type-id='type-id-1729' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24160,7 +24147,7 @@
             <!-- implicit parameter of type 'const OT::Sequence*' -->
             <parameter type-id='type-id-1729' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24169,9 +24156,9 @@
           <!-- bool OT::Sequence::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8Sequence8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Sequence*' -->
-            <parameter type-id='type-id-1305' is-artificial='yes'/>
+            <parameter type-id='type-id-1303' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24182,25 +24169,25 @@
             <!-- implicit parameter of type 'const OT::Sequence*' -->
             <parameter type-id='type-id-1729' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MultipleSubstFormat1 -->
-      <class-decl name='MultipleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-1210'>
+      <class-decl name='MultipleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-1208'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MultipleSubstFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='393' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='393' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::MultipleSubstFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='395' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='395' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::Sequence> OT::MultipleSubstFormat1::sequence -->
-          <var-decl name='sequence' type-id='type-id-1839' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
+          <var-decl name='sequence' type-id='type-id-1837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MultipleSubstFormat1::min_size -->
@@ -24212,7 +24199,7 @@
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
             <parameter type-id='type-id-1591' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24223,7 +24210,7 @@
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
             <parameter type-id='type-id-1591' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24232,7 +24219,7 @@
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
             <parameter type-id='type-id-1591' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24243,7 +24230,7 @@
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
             <parameter type-id='type-id-1591' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24252,9 +24239,9 @@
           <!-- bool OT::MultipleSubstFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT20MultipleSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1211' is-artificial='yes'/>
+            <parameter type-id='type-id-1209' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24265,30 +24252,30 @@
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
             <parameter type-id='type-id-1591' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MultipleSubst -->
-      <class-decl name='MultipleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-1208'>
+      <class-decl name='MultipleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-1206'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::MultipleSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-1871'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-1869'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MultipleSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1210' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
+              <var-decl name='format1' type-id='type-id-1208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::MultipleSubstFormat1 format1;} OT::MultipleSubst::u -->
-          <var-decl name='u' type-id='type-id-1871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
+          <var-decl name='u' type-id='type-id-1869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -24296,9 +24283,9 @@
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
             <parameter type-id='type-id-1588' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24307,9 +24294,9 @@
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
             <parameter type-id='type-id-1588' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24318,9 +24305,9 @@
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
             <parameter type-id='type-id-1588' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24329,9 +24316,9 @@
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
             <parameter type-id='type-id-1588' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24340,18 +24327,18 @@
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
             <parameter type-id='type-id-1588' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::MultipleSubst::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT13MultipleSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1209' is-artificial='yes'/>
+            <parameter type-id='type-id-1207' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24362,25 +24349,25 @@
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
             <parameter type-id='type-id-1588' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::AlternateSubstFormat1 -->
-      <class-decl name='AlternateSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-1000'>
+      <class-decl name='AlternateSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-998'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AlternateSubstFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='544' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='544' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::AlternateSubstFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='546' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='546' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > > OT::AlternateSubstFormat1::alternateSet -->
-          <var-decl name='alternateSet' type-id='type-id-1826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
+          <var-decl name='alternateSet' type-id='type-id-1824' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AlternateSubstFormat1::min_size -->
@@ -24392,7 +24379,7 @@
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
             <parameter type-id='type-id-1409' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24403,7 +24390,7 @@
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
             <parameter type-id='type-id-1409' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24412,7 +24399,7 @@
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
             <parameter type-id='type-id-1409' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24423,7 +24410,7 @@
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
             <parameter type-id='type-id-1409' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24432,9 +24419,9 @@
           <!-- bool OT::AlternateSubstFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT21AlternateSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1001' is-artificial='yes'/>
+            <parameter type-id='type-id-999' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24445,30 +24432,30 @@
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
             <parameter type-id='type-id-1409' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::AlternateSubst -->
-      <class-decl name='AlternateSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-998'>
+      <class-decl name='AlternateSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-996'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::AlternateSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-1872'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-1870'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::AlternateSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1000' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
+              <var-decl name='format1' type-id='type-id-998' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::AlternateSubstFormat1 format1;} OT::AlternateSubst::u -->
-          <var-decl name='u' type-id='type-id-1872' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
+          <var-decl name='u' type-id='type-id-1870' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -24476,9 +24463,9 @@
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
             <parameter type-id='type-id-1406' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24487,9 +24474,9 @@
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
             <parameter type-id='type-id-1406' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24498,9 +24485,9 @@
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
             <parameter type-id='type-id-1406' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24509,9 +24496,9 @@
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
             <parameter type-id='type-id-1406' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24520,18 +24507,18 @@
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
             <parameter type-id='type-id-1406' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::AlternateSubst::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT14AlternateSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='583' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::AlternateSubst*' -->
-            <parameter type-id='type-id-999' is-artificial='yes'/>
+            <parameter type-id='type-id-997' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24542,21 +24529,21 @@
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
             <parameter type-id='type-id-1406' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Ligature -->
-      <class-decl name='Ligature' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='601' column='1' id='type-id-1178'>
+      <class-decl name='Ligature' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='601' column='1' id='type-id-1176'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::GlyphID OT::Ligature::ligGlyph -->
-          <var-decl name='ligGlyph' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
+          <var-decl name='ligGlyph' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::Ligature::component -->
-          <var-decl name='component' type-id='type-id-1166' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='697' column='1'/>
+          <var-decl name='component' type-id='type-id-1164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='697' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Ligature::min_size -->
@@ -24568,7 +24555,7 @@
             <!-- implicit parameter of type 'const OT::Ligature*' -->
             <parameter type-id='type-id-1551' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24579,7 +24566,7 @@
             <!-- implicit parameter of type 'const OT::Ligature*' -->
             <parameter type-id='type-id-1551' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24590,7 +24577,7 @@
             <!-- implicit parameter of type 'const OT::Ligature*' -->
             <parameter type-id='type-id-1551' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24599,9 +24586,9 @@
           <!-- bool OT::Ligature::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8Ligature8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Ligature*' -->
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24612,7 +24599,7 @@
             <!-- implicit parameter of type 'const OT::Ligature*' -->
             <parameter type-id='type-id-1551' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24621,13 +24608,13 @@
           <!-- bool OT::Ligature::serialize(OT::hb_serialize_context_t*, OT::GlyphID, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize' mangled-name='_ZN2OT8Ligature9serializeEPNS_22hb_serialize_context_tENS_7IntTypeItLj2EEERNS_8SupplierIS4_EEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='676' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Ligature*' -->
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'typedef OT::GlyphID' -->
-            <parameter type-id='type-id-846'/>
+            <parameter type-id='type-id-844'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -24636,10 +24623,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::LigatureSet -->
-      <class-decl name='LigatureSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='705' column='1' id='type-id-1179'>
+      <class-decl name='LigatureSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='705' column='1' id='type-id-1177'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetArrayOf<OT::Ligature> OT::LigatureSet::ligature -->
-          <var-decl name='ligature' type-id='type-id-1832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
+          <var-decl name='ligature' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigatureSet::min_size -->
@@ -24651,7 +24638,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
             <parameter type-id='type-id-1554' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24662,7 +24649,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
             <parameter type-id='type-id-1554' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24673,7 +24660,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
             <parameter type-id='type-id-1554' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24682,9 +24669,9 @@
           <!-- bool OT::LigatureSet::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT11LigatureSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='767' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LigatureSet*' -->
-            <parameter type-id='type-id-541' is-artificial='yes'/>
+            <parameter type-id='type-id-539' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24695,7 +24682,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
             <parameter type-id='type-id-1554' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24704,35 +24691,35 @@
           <!-- bool OT::LigatureSet::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<unsigned int>&, unsigned int, OT::Supplier<OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='serialize' mangled-name='_ZN2OT11LigatureSet9serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LigatureSet*' -->
-            <parameter type-id='type-id-541' is-artificial='yes'/>
+            <parameter type-id='type-id-539' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-1376'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::LigatureSubstFormat1 -->
-      <class-decl name='LigatureSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='781' column='1' id='type-id-1182'>
+      <class-decl name='LigatureSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='781' column='1' id='type-id-1180'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::LigatureSubstFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='857' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='857' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::LigatureSubstFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='859' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='859' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::LigatureSet> OT::LigatureSubstFormat1::ligatureSet -->
-          <var-decl name='ligatureSet' type-id='type-id-1833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
+          <var-decl name='ligatureSet' type-id='type-id-1831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigatureSubstFormat1::min_size -->
@@ -24744,7 +24731,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
             <parameter type-id='type-id-1559' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24753,7 +24740,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
             <parameter type-id='type-id-1559' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24764,7 +24751,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
             <parameter type-id='type-id-1559' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -24775,7 +24762,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
             <parameter type-id='type-id-1559' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24784,9 +24771,9 @@
           <!-- bool OT::LigatureSubstFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT20LigatureSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='851' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-563' is-artificial='yes'/>
+            <parameter type-id='type-id-561' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24797,7 +24784,7 @@
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
             <parameter type-id='type-id-1559' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24806,44 +24793,44 @@
           <!-- bool OT::LigatureSubstFormat1::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<unsigned int>&, unsigned int, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<unsigned int>&, OT::Supplier<OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='serialize' mangled-name='_ZN2OT20LigatureSubstFormat19serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_S9_S7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='829' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-563' is-artificial='yes'/>
+            <parameter type-id='type-id-561' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-1376'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-1376'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::LigatureSubst -->
-      <class-decl name='LigatureSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-1180'>
+      <class-decl name='LigatureSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-1178'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::LigatureSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-1873'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-1871'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::LigatureSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1182' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='911' column='1'/>
+              <var-decl name='format1' type-id='type-id-1180' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='911' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::LigatureSubstFormat1 format1;} OT::LigatureSubst::u -->
-          <var-decl name='u' type-id='type-id-1873' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
+          <var-decl name='u' type-id='type-id-1871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -24851,9 +24838,9 @@
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
             <parameter type-id='type-id-1556' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24862,9 +24849,9 @@
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
             <parameter type-id='type-id-1556' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24873,9 +24860,9 @@
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
             <parameter type-id='type-id-1556' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24884,9 +24871,9 @@
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
             <parameter type-id='type-id-1556' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24895,18 +24882,18 @@
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
             <parameter type-id='type-id-1556' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::LigatureSubst::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT13LigatureSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='899' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1181' is-artificial='yes'/>
+            <parameter type-id='type-id-1179' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24917,49 +24904,49 @@
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
             <parameter type-id='type-id-1556' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::LigatureSubst::serialize(OT::hb_serialize_context_t*, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<unsigned int>&, unsigned int, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<unsigned int>&, OT::Supplier<OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='serialize' mangled-name='_ZN2OT13LigatureSubst9serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_S9_S7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='870' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1181' is-artificial='yes'/>
+            <parameter type-id='type-id-1179' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-1376'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-1376'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ContextSubst -->
-      <class-decl name='ContextSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-1874'>
+      <class-decl name='ContextSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-1872'>
         <!-- struct OT::Context -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1108'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1106'/>
       </class-decl>
       <!-- struct OT::ChainContextSubst -->
-      <class-decl name='ChainContextSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-1875'>
+      <class-decl name='ChainContextSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-1873'>
         <!-- struct OT::ChainContext -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1081'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1079'/>
       </class-decl>
       <!-- struct OT::ExtensionSubst -->
       <class-decl name='ExtensionSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-1513'>
         <!-- struct OT::Extension<OT::ExtensionSubst> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1142'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1140'/>
         <member-function access='public'>
           <!-- bool OT::ExtensionSubst::is_reverse() -->
           <function-decl name='is_reverse' mangled-name='_ZNK2OT14ExtensionSubst10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='924' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -24971,26 +24958,26 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ReverseChainSingleSubstFormat1 -->
-      <class-decl name='ReverseChainSingleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-1292'>
+      <class-decl name='ReverseChainSingleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-1290'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ReverseChainSingleSubstFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1032' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1032' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ReverseChainSingleSubstFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1034' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1034' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ReverseChainSingleSubstFormat1::backtrack -->
-          <var-decl name='backtrack' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ReverseChainSingleSubstFormat1::lookaheadX -->
-          <var-decl name='lookaheadX' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ReverseChainSingleSubstFormat1::substituteX -->
-          <var-decl name='substituteX' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1045' column='1'/>
+          <var-decl name='substituteX' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1045' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ReverseChainSingleSubstFormat1::min_size -->
@@ -25002,7 +24989,7 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
             <parameter type-id='type-id-1715' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25013,7 +25000,7 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
             <parameter type-id='type-id-1715' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25022,7 +25009,7 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
             <parameter type-id='type-id-1715' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -25033,7 +25020,7 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
             <parameter type-id='type-id-1715' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -25042,9 +25029,9 @@
           <!-- bool OT::ReverseChainSingleSubstFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT30ReverseChainSingleSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1020' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1293' is-artificial='yes'/>
+            <parameter type-id='type-id-1291' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25055,30 +25042,30 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
             <parameter type-id='type-id-1715' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ReverseChainSingleSubst -->
-      <class-decl name='ReverseChainSingleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-1290'>
+      <class-decl name='ReverseChainSingleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-1288'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ReverseChainSingleSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-1876'>
+          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-1874'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ReverseChainSingleSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1292' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
+              <var-decl name='format1' type-id='type-id-1290' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ReverseChainSingleSubstFormat1 format1;} OT::ReverseChainSingleSubst::u -->
-          <var-decl name='u' type-id='type-id-1876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
+          <var-decl name='u' type-id='type-id-1874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
@@ -25086,9 +25073,9 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
             <parameter type-id='type-id-1712' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25097,9 +25084,9 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
             <parameter type-id='type-id-1712' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25108,9 +25095,9 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
             <parameter type-id='type-id-1712' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25119,9 +25106,9 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
             <parameter type-id='type-id-1712' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25130,18 +25117,18 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
             <parameter type-id='type-id-1712' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::ReverseChainSingleSubst::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT23ReverseChainSingleSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1063' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1291' is-artificial='yes'/>
+            <parameter type-id='type-id-1289' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25152,17 +25139,17 @@
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
             <parameter type-id='type-id-1712' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SubstLookupSubTable -->
-      <class-decl name='SubstLookupSubTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-1317'>
+      <class-decl name='SubstLookupSubTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-1315'>
         <member-type access='public'>
           <!-- enum OT::SubstLookupSubTable::Type -->
-          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-1877'>
+          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-1875'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='Single' value='1'/>
             <enumerator name='Multiple' value='2'/>
@@ -25176,43 +25163,43 @@
         </member-type>
         <member-type access='protected'>
           <!-- union {struct {OT::USHORT sub_format;} header; OT::SingleSubst single; OT::MultipleSubst multiple; OT::AlternateSubst alternate; OT::LigatureSubst ligature; OT::ContextSubst context; OT::ChainContextSubst chainContext; OT::ExtensionSubst extension; OT::ReverseChainSingleSubst reverseChainContextSingle;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-1878'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-1876'>
             <member-type access='public'>
               <!-- struct {OT::USHORT sub_format;} -->
-              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-1867'>
+              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-1865'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <!-- OT::USHORT sub_format -->
-                  <var-decl name='sub_format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
+                  <var-decl name='sub_format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
                 </data-member>
               </class-decl>
             </member-type>
             <data-member access='public'>
               <!-- struct {OT::USHORT sub_format;} header -->
-              <var-decl name='header' type-id='type-id-1867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
+              <var-decl name='header' type-id='type-id-1865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::SingleSubst single -->
-              <var-decl name='single' type-id='type-id-1312' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
+              <var-decl name='single' type-id='type-id-1310' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::MultipleSubst multiple -->
-              <var-decl name='multiple' type-id='type-id-1208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
+              <var-decl name='multiple' type-id='type-id-1206' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::AlternateSubst alternate -->
-              <var-decl name='alternate' type-id='type-id-998' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
+              <var-decl name='alternate' type-id='type-id-996' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::LigatureSubst ligature -->
-              <var-decl name='ligature' type-id='type-id-1180' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
+              <var-decl name='ligature' type-id='type-id-1178' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ContextSubst context -->
-              <var-decl name='context' type-id='type-id-1874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
+              <var-decl name='context' type-id='type-id-1872' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ChainContextSubst chainContext -->
-              <var-decl name='chainContext' type-id='type-id-1875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
+              <var-decl name='chainContext' type-id='type-id-1873' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ExtensionSubst extension -->
@@ -25220,13 +25207,13 @@
             </data-member>
             <data-member access='public'>
               <!-- OT::ReverseChainSingleSubst reverseChainContextSingle -->
-              <var-decl name='reverseChainContextSingle' type-id='type-id-1290' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
+              <var-decl name='reverseChainContextSingle' type-id='type-id-1288' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {struct {OT::USHORT sub_format;} header; OT::SingleSubst single; OT::MultipleSubst multiple; OT::AlternateSubst alternate; OT::LigatureSubst ligature; OT::ContextSubst context; OT::ChainContextSubst chainContext; OT::ExtensionSubst extension; OT::ReverseChainSingleSubst reverseChainContextSingle;} OT::SubstLookupSubTable::u -->
-          <var-decl name='u' type-id='type-id-1878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
+          <var-decl name='u' type-id='type-id-1876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SubstLookupSubTable::min_size -->
@@ -25238,11 +25225,11 @@
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
             <parameter type-id='type-id-1760' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25251,20 +25238,20 @@
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
             <parameter type-id='type-id-1760' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::SubstLookupSubTable::sanitize(OT::hb_sanitize_context_t*, unsigned int) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT19SubstLookupSubTable8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1117' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-542' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -25277,11 +25264,11 @@
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
             <parameter type-id='type-id-1760' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25290,11 +25277,11 @@
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
             <parameter type-id='type-id-1760' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25303,11 +25290,11 @@
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
             <parameter type-id='type-id-1760' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25316,25 +25303,25 @@
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
             <parameter type-id='type-id-1760' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SubstLookup -->
-      <class-decl name='SubstLookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1154' column='1' id='type-id-938'>
+      <class-decl name='SubstLookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1154' column='1' id='type-id-936'>
         <!-- struct OT::Lookup -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1183'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1181'/>
         <member-function access='public'>
           <!-- void OT::SubstLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -25345,9 +25332,9 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25356,9 +25343,9 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25367,9 +25354,9 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25378,9 +25365,9 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -25398,9 +25385,9 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- parameter of type 'const hb_set_digest_t*' -->
-            <parameter type-id='type-id-1802'/>
+            <parameter type-id='type-id-1806'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25409,9 +25396,9 @@
           <!-- bool OT::SubstLookup::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT11SubstLookup8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SubstLookup*' -->
-            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25431,7 +25418,7 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25442,9 +25429,9 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25453,9 +25440,9 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25473,29 +25460,29 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::dispatch_recurse_func<OT::hb_collect_glyphs_context_t>(unsigned int) -->
           <function-decl name='dispatch_recurse_func&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::dispatch_recurse_func<OT::hb_closure_context_t>(unsigned int) -->
           <function-decl name='dispatch_recurse_func&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <!-- bool OT::SubstLookup::apply_recurse_func(unsigned int) -->
           <function-decl name='apply_recurse_func' mangled-name='_ZN2OT11SubstLookup18apply_recurse_funcEPNS_18hb_apply_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1214' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -25508,7 +25495,7 @@
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
             <parameter type-id='type-id-1757' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -25517,28 +25504,28 @@
           <!-- OT::SubstLookupSubTable& OT::SubstLookup::serialize_subtable(OT::hb_serialize_context_t*, unsigned int) -->
           <function-decl name='serialize_subtable' mangled-name='_ZN2OT11SubstLookup18serialize_subtableEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SubstLookup*' -->
-            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1318'/>
+            <return type-id='type-id-1316'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::SubstLookup::serialize_single(OT::hb_serialize_context_t*, uint32_t, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, unsigned int) -->
           <function-decl name='serialize_single' mangled-name='_ZN2OT11SubstLookup16serialize_singleEPNS_22hb_serialize_context_tEjRNS_8SupplierINS_7IntTypeItLj2EEEEES7_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SubstLookup*' -->
-            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'typedef uint32_t' -->
             <parameter type-id='type-id-100'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -25549,35 +25536,35 @@
           <!-- bool OT::SubstLookup::serialize_ligature(OT::hb_serialize_context_t*, uint32_t, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<unsigned int>&, unsigned int, OT::Supplier<OT::IntType<short unsigned int, 2u> >&, OT::Supplier<unsigned int>&, OT::Supplier<OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='serialize_ligature' mangled-name='_ZN2OT11SubstLookup18serialize_ligatureEPNS_22hb_serialize_context_tEjRNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_S9_S7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::SubstLookup*' -->
-            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <!-- parameter of type 'typedef uint32_t' -->
             <parameter type-id='type-id-100'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-1376'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-1376'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::GSUB -->
-      <class-decl name='GSUB' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1318' column='1' id='type-id-1162'>
+      <class-decl name='GSUB' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1318' column='1' id='type-id-1160'>
         <!-- struct OT::GSUBGPOS -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1164'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1162'/>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::GSUB::tableTag -->
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1319' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1319' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GSUB::static_size -->
@@ -25617,30 +25604,30 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::SubstLookup& -->
-            <return type-id='type-id-933'/>
+            <return type-id='type-id-931'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::GSUB::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4GSUB8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::GSUB*' -->
-            <parameter type-id='type-id-1163' is-artificial='yes'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::hb_closure_context_t -->
-      <class-decl name='hb_closure_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1390'>
+      <class-decl name='hb_closure_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1388'>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_closure_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1879' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-1870'/>
+          <typedef-decl name='return_t' type-id='type-id-1877' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-1868'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* OT::hb_closure_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1810' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1880'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1785' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1878'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_closure_context_t::max_debug_depth -->
@@ -25648,15 +25635,15 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- hb_face_t* OT::hb_closure_context_t::face -->
-          <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='76' column='1'/>
+          <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_set_t* OT::hb_closure_context_t::glyphs -->
-          <var-decl name='glyphs' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
+          <var-decl name='glyphs' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- OT::hb_closure_context_t::recurse_func_t OT::hb_closure_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- unsigned int OT::hb_closure_context_t::nesting_level_left -->
@@ -25670,11 +25657,11 @@
           <!-- OT::hb_closure_context_t::hb_closure_context_t(hb_face_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-160'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -25685,139 +25672,139 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
             <parameter type-id='type-id-1739'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
             <parameter type-id='type-id-1742'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
             <parameter type-id='type-id-1590'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
             <parameter type-id='type-id-1408'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
             <parameter type-id='type-id-1558'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
             <parameter type-id='type-id-1714'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
             <parameter type-id='type-id-1483'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
             <parameter type-id='type-id-1486'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
             <parameter type-id='type-id-1489'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
             <parameter type-id='type-id-1460'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
             <parameter type-id='type-id-1463'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
             <parameter type-id='type-id-1466'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- const char* OT::hb_closure_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT20hb_closure_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-15'/>
           </function-decl>
@@ -25826,18 +25813,18 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::default_return_value() -->
           <function-decl name='default_return_value' mangled-name='_ZN2OT20hb_closure_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::recurse(unsigned int) -->
           <function-decl name='recurse' mangled-name='_ZN2OT20hb_closure_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25846,7 +25833,7 @@
             <!-- implicit parameter of type 'const OT::hb_closure_context_t*' -->
             <parameter type-id='type-id-1778' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_closure_context_t::return_t' -->
-            <parameter type-id='type-id-1870'/>
+            <parameter type-id='type-id-1868'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25855,9 +25842,9 @@
           <!-- void OT::hb_closure_context_t::set_recurse_func(OT::hb_closure_context_t::recurse_func_t) -->
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT20hb_closure_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_closure_context_t::recurse_func_t' -->
-            <parameter type-id='type-id-1880'/>
+            <parameter type-id='type-id-1878'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -25866,11 +25853,11 @@
           <!-- OT::hb_closure_context_t::hb_closure_context_t(hb_face_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-160'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -25879,10 +25866,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::hb_would_apply_context_t -->
-      <class-decl name='hb_would_apply_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1396'>
+      <class-decl name='hb_would_apply_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1394'>
         <member-type access='public'>
           <!-- typedef bool OT::hb_would_apply_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-1869'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-1867'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_would_apply_context_t::max_debug_depth -->
@@ -25890,7 +25877,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- hb_face_t* OT::hb_would_apply_context_t::face -->
-          <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='115' column='1'/>
+          <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='115' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- const hb_codepoint_t* OT::hb_would_apply_context_t::glyphs -->
@@ -25912,9 +25899,9 @@
           <!-- OT::hb_would_apply_context_t::hb_would_apply_context_t(hb_face_t*, const hb_codepoint_t*, unsigned int, bool) -->
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-160'/>
             <!-- parameter of type 'const hb_codepoint_t*' -->
             <parameter type-id='type-id-95'/>
             <!-- parameter of type 'unsigned int' -->
@@ -25929,139 +25916,139 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
             <parameter type-id='type-id-1739'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
             <parameter type-id='type-id-1742'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
             <parameter type-id='type-id-1590'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
             <parameter type-id='type-id-1408'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
             <parameter type-id='type-id-1714'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
             <parameter type-id='type-id-1558'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
             <parameter type-id='type-id-1483'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
             <parameter type-id='type-id-1486'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
             <parameter type-id='type-id-1489'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
             <parameter type-id='type-id-1460'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
             <parameter type-id='type-id-1463'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
             <parameter type-id='type-id-1466'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- const char* OT::hb_would_apply_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT24hb_would_apply_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-15'/>
           </function-decl>
@@ -26070,7 +26057,7 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::default_return_value() -->
           <function-decl name='default_return_value' mangled-name='_ZN2OT24hb_would_apply_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -26079,7 +26066,7 @@
             <!-- implicit parameter of type 'const OT::hb_would_apply_context_t*' -->
             <parameter type-id='type-id-1782' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_would_apply_context_t::return_t' -->
-            <parameter type-id='type-id-1869'/>
+            <parameter type-id='type-id-1867'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26088,9 +26075,9 @@
           <!-- OT::hb_would_apply_context_t::hb_would_apply_context_t(hb_face_t*, const hb_codepoint_t*, unsigned int, bool) -->
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-160'/>
             <!-- parameter of type 'const hb_codepoint_t*' -->
             <parameter type-id='type-id-95'/>
             <!-- parameter of type 'unsigned int' -->
@@ -26103,14 +26090,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::hb_collect_glyphs_context_t -->
-      <class-decl name='hb_collect_glyphs_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1392'>
+      <class-decl name='hb_collect_glyphs_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1390'>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_collect_glyphs_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1879' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-1856'/>
+          <typedef-decl name='return_t' type-id='type-id-1877' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-1854'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* OT::hb_collect_glyphs_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1812' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1881'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1787' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1879'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_collect_glyphs_context_t::max_debug_depth -->
@@ -26118,31 +26105,31 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- hb_face_t* OT::hb_collect_glyphs_context_t::face -->
-          <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='193' column='1'/>
+          <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='193' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::before -->
-          <var-decl name='before' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
+          <var-decl name='before' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::input -->
-          <var-decl name='input' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
+          <var-decl name='input' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::after -->
-          <var-decl name='after' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
+          <var-decl name='after' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::output -->
-          <var-decl name='output' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
+          <var-decl name='output' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <!-- OT::hb_collect_glyphs_context_t::recurse_func_t OT::hb_collect_glyphs_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- hb_set_t OT::hb_collect_glyphs_context_t::recursed_lookups -->
-          <var-decl name='recursed_lookups' type-id='type-id-1882' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
+          <var-decl name='recursed_lookups' type-id='type-id-1880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='66880'>
           <!-- unsigned int OT::hb_collect_glyphs_context_t::nesting_level_left -->
@@ -26156,17 +26143,17 @@
           <!-- OT::hb_collect_glyphs_context_t::hb_collect_glyphs_context_t(hb_face_t*, hb_set_t*, hb_set_t*, hb_set_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-160'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -26177,7 +26164,7 @@
           <!-- OT::hb_collect_glyphs_context_t::~hb_collect_glyphs_context_t(int) -->
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-9' is-artificial='yes'/>
             <!-- void -->
@@ -26188,227 +26175,227 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
             <parameter type-id='type-id-1739'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
             <parameter type-id='type-id-1742'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
             <parameter type-id='type-id-1408'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
             <parameter type-id='type-id-1558'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
             <parameter type-id='type-id-1590'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
             <parameter type-id='type-id-1714'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
             <parameter type-id='type-id-1733'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
             <parameter type-id='type-id-1735'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
             <parameter type-id='type-id-1501'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
             <parameter type-id='type-id-1571'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
             <parameter type-id='type-id-1580'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
             <parameter type-id='type-id-1584'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
             <parameter type-id='type-id-1666'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
             <parameter type-id='type-id-1668'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
             <parameter type-id='type-id-1483'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
             <parameter type-id='type-id-1486'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
             <parameter type-id='type-id-1489'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
             <parameter type-id='type-id-1460'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
             <parameter type-id='type-id-1463'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
             <parameter type-id='type-id-1466'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- const char* OT::hb_collect_glyphs_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT27hb_collect_glyphs_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-15'/>
           </function-decl>
@@ -26417,18 +26404,18 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::default_return_value() -->
           <function-decl name='default_return_value' mangled-name='_ZN2OT27hb_collect_glyphs_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::recurse(unsigned int) -->
           <function-decl name='recurse' mangled-name='_ZN2OT27hb_collect_glyphs_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -26437,7 +26424,7 @@
             <!-- implicit parameter of type 'const OT::hb_collect_glyphs_context_t*' -->
             <parameter type-id='type-id-1780' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_collect_glyphs_context_t::return_t' -->
-            <parameter type-id='type-id-1856'/>
+            <parameter type-id='type-id-1854'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26446,9 +26433,9 @@
           <!-- void OT::hb_collect_glyphs_context_t::set_recurse_func(OT::hb_collect_glyphs_context_t::recurse_func_t) -->
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT27hb_collect_glyphs_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_collect_glyphs_context_t::recurse_func_t' -->
-            <parameter type-id='type-id-1881'/>
+            <parameter type-id='type-id-1879'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -26457,17 +26444,17 @@
           <!-- OT::hb_collect_glyphs_context_t::hb_collect_glyphs_context_t(hb_face_t*, hb_set_t*, hb_set_t*, hb_set_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-160'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -26478,7 +26465,7 @@
           <!-- OT::hb_collect_glyphs_context_t::~hb_collect_glyphs_context_t(int) -->
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-9' is-artificial='yes'/>
             <!-- void -->
@@ -26487,10 +26474,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::hb_get_coverage_context_t -->
-      <class-decl name='hb_get_coverage_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1394'>
+      <class-decl name='hb_get_coverage_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1392'>
         <member-type access='public'>
           <!-- typedef const OT::Coverage& OT::hb_get_coverage_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-979' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-1854'/>
+          <typedef-decl name='return_t' type-id='type-id-977' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-1852'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_get_coverage_context_t::max_debug_depth -->
@@ -26504,7 +26491,7 @@
           <!-- OT::hb_get_coverage_context_t::hb_get_coverage_context_t() -->
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -26513,227 +26500,227 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
             <parameter type-id='type-id-1739'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
             <parameter type-id='type-id-1742'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
             <parameter type-id='type-id-1590'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
             <parameter type-id='type-id-1408'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
             <parameter type-id='type-id-1558'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
             <parameter type-id='type-id-1483'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
             <parameter type-id='type-id-1486'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
             <parameter type-id='type-id-1489'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
             <parameter type-id='type-id-1714'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
             <parameter type-id='type-id-1733'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
             <parameter type-id='type-id-1735'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
             <parameter type-id='type-id-1666'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
             <parameter type-id='type-id-1668'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
             <parameter type-id='type-id-1501'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
             <parameter type-id='type-id-1571'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
             <parameter type-id='type-id-1580'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
             <parameter type-id='type-id-1584'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
             <parameter type-id='type-id-1460'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
             <parameter type-id='type-id-1463'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
             <parameter type-id='type-id-1466'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- const char* OT::hb_get_coverage_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT25hb_get_coverage_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-15'/>
           </function-decl>
@@ -26742,14 +26729,14 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::default_return_value() -->
           <function-decl name='default_return_value' mangled-name='_ZN2OT25hb_get_coverage_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <!-- OT::hb_get_coverage_context_t::hb_get_coverage_context_t() -->
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -26758,143 +26745,143 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
             <parameter type-id='type-id-1739'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
             <parameter type-id='type-id-1742'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
             <parameter type-id='type-id-1590'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
             <parameter type-id='type-id-1408'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
             <parameter type-id='type-id-1558'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
             <parameter type-id='type-id-1483'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
             <parameter type-id='type-id-1486'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
             <parameter type-id='type-id-1489'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
             <parameter type-id='type-id-1714'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
             <parameter type-id='type-id-1460'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
             <parameter type-id='type-id-1463'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
             <parameter type-id='type-id-1466'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::hb_apply_context_t -->
-      <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-1382'>
+      <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-1380'>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::matcher_t -->
-          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1384'>
+          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1382'>
             <member-type access='public'>
               <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
-              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1883'>
+              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1881'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='MATCH_NO' value='0'/>
                 <enumerator name='MATCH_YES' value='1'/>
@@ -26903,7 +26890,7 @@
             </member-type>
             <member-type access='public'>
               <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
-              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1884'>
+              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1882'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='SKIP_NO' value='0'/>
                 <enumerator name='SKIP_YES' value='1'/>
@@ -26912,7 +26899,7 @@
             </member-type>
             <member-type access='public'>
               <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::hb_apply_context_t::matcher_t::match_func_t -->
-              <typedef-decl name='match_func_t' type-id='type-id-1401' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1885'/>
+              <typedef-decl name='match_func_t' type-id='type-id-1401' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1883'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::matcher_t::lookup_props -->
@@ -26936,7 +26923,7 @@
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t::match_func_t OT::hb_apply_context_t::matcher_t::match_func -->
-              <var-decl name='match_func' type-id='type-id-1885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
+              <var-decl name='match_func' type-id='type-id-1883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='192'>
               <!-- void* OT::hb_apply_context_t::matcher_t::match_data -->
@@ -26946,7 +26933,7 @@
               <!-- OT::hb_apply_context_t::matcher_t::matcher_t() -->
               <function-decl name='matcher_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -26955,7 +26942,7 @@
               <!-- void OT::hb_apply_context_t::matcher_t::set_lookup_props(unsigned int) -->
               <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- void -->
@@ -26966,7 +26953,7 @@
               <!-- void OT::hb_apply_context_t::matcher_t::set_ignore_zwnj(bool) -->
               <function-decl name='set_ignore_zwnj' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t15set_ignore_zwnjEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <!-- parameter of type 'bool' -->
                 <parameter type-id='type-id-1'/>
                 <!-- void -->
@@ -26977,7 +26964,7 @@
               <!-- void OT::hb_apply_context_t::matcher_t::set_ignore_zwj(bool) -->
               <function-decl name='set_ignore_zwj' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t14set_ignore_zwjEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <!-- parameter of type 'bool' -->
                 <parameter type-id='type-id-1'/>
                 <!-- void -->
@@ -26988,7 +26975,7 @@
               <!-- void OT::hb_apply_context_t::matcher_t::set_mask(hb_mask_t) -->
               <function-decl name='set_mask' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t8set_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <!-- parameter of type 'typedef hb_mask_t' -->
                 <parameter type-id='type-id-92'/>
                 <!-- void -->
@@ -26999,7 +26986,7 @@
               <!-- void OT::hb_apply_context_t::matcher_t::set_syllable(uint8_t) -->
               <function-decl name='set_syllable' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t12set_syllableEh' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <!-- parameter of type 'typedef uint8_t' -->
                 <parameter type-id='type-id-76'/>
                 <!-- void -->
@@ -27010,9 +26997,9 @@
               <!-- void OT::hb_apply_context_t::matcher_t::set_match_func(OT::hb_apply_context_t::matcher_t::match_func_t, void*) -->
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <!-- parameter of type 'typedef OT::hb_apply_context_t::matcher_t::match_func_t' -->
-                <parameter type-id='type-id-1885'/>
+                <parameter type-id='type-id-1883'/>
                 <!-- parameter of type 'void*' -->
                 <parameter type-id='type-id-17'/>
                 <!-- void -->
@@ -27029,7 +27016,7 @@
                 <!-- parameter of type 'const OT::USHORT*' -->
                 <parameter type-id='type-id-1764'/>
                 <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
-                <return type-id='type-id-1883'/>
+                <return type-id='type-id-1881'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -27042,14 +27029,14 @@
                 <!-- parameter of type 'const hb_glyph_info_t&' -->
                 <parameter type-id='type-id-94'/>
                 <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
-                <return type-id='type-id-1884'/>
+                <return type-id='type-id-1882'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <!-- OT::hb_apply_context_t::matcher_t::matcher_t() -->
               <function-decl name='matcher_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -27058,18 +27045,18 @@
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_forward_iterator_t -->
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1388'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1386'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
               <!-- OT::hb_apply_context_t* OT::hb_apply_context_t::skipping_forward_iterator_t::c -->
-              <var-decl name='c' type-id='type-id-1383' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
+              <var-decl name='c' type-id='type-id-1381' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t OT::hb_apply_context_t::skipping_forward_iterator_t::matcher -->
-              <var-decl name='matcher' type-id='type-id-1384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1382' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_forward_iterator_t::match_glyph_data -->
@@ -27087,9 +27074,9 @@
               <!-- OT::hb_apply_context_t::skipping_forward_iterator_t::skipping_forward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1389' is-artificial='yes'/>
+                <parameter type-id='type-id-1387' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-1383'/>
+                <parameter type-id='type-id-1381'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27113,9 +27100,9 @@
               <!-- void OT::hb_apply_context_t::skipping_forward_iterator_t::set_match_func(OT::hb_apply_context_t::matcher_t::match_func_t, void*, const OT::USHORT*) -->
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='416' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1389' is-artificial='yes'/>
+                <parameter type-id='type-id-1387' is-artificial='yes'/>
                 <!-- parameter of type 'typedef OT::hb_apply_context_t::matcher_t::match_func_t' -->
-                <parameter type-id='type-id-1885'/>
+                <parameter type-id='type-id-1883'/>
                 <!-- parameter of type 'void*' -->
                 <parameter type-id='type-id-17'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
@@ -27128,7 +27115,7 @@
               <!-- bool OT::hb_apply_context_t::skipping_forward_iterator_t::next() -->
               <function-decl name='next' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='426' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1389' is-artificial='yes'/>
+                <parameter type-id='type-id-1387' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27137,9 +27124,9 @@
               <!-- OT::hb_apply_context_t::skipping_forward_iterator_t::skipping_forward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1389' is-artificial='yes'/>
+                <parameter type-id='type-id-1387' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-1383'/>
+                <parameter type-id='type-id-1381'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27154,18 +27141,18 @@
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_backward_iterator_t -->
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1386'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1384'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
               <!-- OT::hb_apply_context_t* OT::hb_apply_context_t::skipping_backward_iterator_t::c -->
-              <var-decl name='c' type-id='type-id-1383' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
+              <var-decl name='c' type-id='type-id-1381' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t OT::hb_apply_context_t::skipping_backward_iterator_t::matcher -->
-              <var-decl name='matcher' type-id='type-id-1384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1382' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_backward_iterator_t::match_glyph_data -->
@@ -27179,9 +27166,9 @@
               <!-- OT::hb_apply_context_t::skipping_backward_iterator_t::skipping_backward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-1383'/>
+                <parameter type-id='type-id-1381'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27205,9 +27192,9 @@
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::set_match_func(OT::hb_apply_context_t::matcher_t::match_func_t, void*, const OT::USHORT*) -->
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
                 <!-- parameter of type 'typedef OT::hb_apply_context_t::matcher_t::match_func_t' -->
-                <parameter type-id='type-id-1885'/>
+                <parameter type-id='type-id-1883'/>
                 <!-- parameter of type 'void*' -->
                 <parameter type-id='type-id-17'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
@@ -27220,7 +27207,7 @@
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::set_lookup_props(unsigned int) -->
               <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- void -->
@@ -27231,7 +27218,7 @@
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::reject() -->
               <function-decl name='reject' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t6rejectEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='495' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -27240,7 +27227,7 @@
               <!-- bool OT::hb_apply_context_t::skipping_backward_iterator_t::prev() -->
               <function-decl name='prev' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27249,11 +27236,11 @@
         </member-type>
         <member-type access='public'>
           <!-- typedef bool OT::hb_apply_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-1855'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-1853'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* OT::hb_apply_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1808' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1886'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1397' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1884'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_apply_context_t::max_debug_depth -->
@@ -27269,7 +27256,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- hb_face_t* OT::hb_apply_context_t::face -->
-          <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
+          <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- hb_buffer_t* OT::hb_apply_context_t::buffer -->
@@ -27289,7 +27276,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- OT::hb_apply_context_t::recurse_func_t OT::hb_apply_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1886' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1884' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <!-- unsigned int OT::hb_apply_context_t::nesting_level_left -->
@@ -27315,7 +27302,7 @@
           <!-- OT::hb_apply_context_t::hb_apply_context_t(unsigned int, hb_font_t*, hb_buffer_t*) -->
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_font_t*' -->
@@ -27330,220 +27317,220 @@
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
             <parameter type-id='type-id-1739'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
             <parameter type-id='type-id-1742'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
             <parameter type-id='type-id-1590'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
             <parameter type-id='type-id-1408'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
             <parameter type-id='type-id-1714'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
             <parameter type-id='type-id-1558'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
             <parameter type-id='type-id-1483'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
             <parameter type-id='type-id-1486'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
             <parameter type-id='type-id-1489'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
             <parameter type-id='type-id-1460'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
             <parameter type-id='type-id-1463'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
             <parameter type-id='type-id-1466'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
             <parameter type-id='type-id-1501'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
             <parameter type-id='type-id-1571'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
             <parameter type-id='type-id-1580'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
             <parameter type-id='type-id-1584'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
             <parameter type-id='type-id-1733'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
             <parameter type-id='type-id-1735'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
             <parameter type-id='type-id-1666'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
             <parameter type-id='type-id-1668'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -27565,14 +27552,14 @@
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::default_return_value() -->
           <function-decl name='default_return_value' mangled-name='_ZN2OT18hb_apply_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- const char* OT::hb_apply_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT18hb_apply_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-15'/>
           </function-decl>
@@ -27618,11 +27605,11 @@
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::recurse(unsigned int) -->
           <function-decl name='recurse' mangled-name='_ZN2OT18hb_apply_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -27631,7 +27618,7 @@
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_apply_context_t::return_t' -->
-            <parameter type-id='type-id-1855'/>
+            <parameter type-id='type-id-1853'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -27640,9 +27627,9 @@
           <!-- void OT::hb_apply_context_t::set_recurse_func(OT::hb_apply_context_t::recurse_func_t) -->
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT18hb_apply_context_t16set_recurse_funcEPFbPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_apply_context_t::recurse_func_t' -->
-            <parameter type-id='type-id-1886'/>
+            <parameter type-id='type-id-1884'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -27651,7 +27638,7 @@
           <!-- void OT::hb_apply_context_t::set_lookup_mask(hb_mask_t) -->
           <function-decl name='set_lookup_mask' mangled-name='_ZN2OT18hb_apply_context_t15set_lookup_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_mask_t' -->
             <parameter type-id='type-id-92'/>
             <!-- void -->
@@ -27662,7 +27649,7 @@
           <!-- void OT::hb_apply_context_t::set_auto_zwj(bool) -->
           <function-decl name='set_auto_zwj' mangled-name='_ZN2OT18hb_apply_context_t12set_auto_zwjEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'bool' -->
             <parameter type-id='type-id-1'/>
             <!-- void -->
@@ -27703,7 +27690,7 @@
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <!-- parameter of type 'const hb_glyph_info_t*' -->
-            <parameter type-id='type-id-1784'/>
+            <parameter type-id='type-id-1788'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- bool -->
@@ -27714,7 +27701,7 @@
           <!-- void OT::hb_apply_context_t::set_lookup(const OT::Lookup&) -->
           <function-decl name='set_lookup' mangled-name='_ZN2OT18hb_apply_context_t10set_lookupERKNS_6LookupE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='316' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Lookup&' -->
             <parameter type-id='type-id-1561'/>
             <!-- void -->
@@ -27725,7 +27712,7 @@
           <!-- OT::hb_apply_context_t::hb_apply_context_t(unsigned int, hb_font_t*, hb_buffer_t*) -->
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_font_t*' -->
@@ -27740,7 +27727,7 @@
           <!-- OT::hb_apply_context_t::hb_apply_context_t(unsigned int, hb_font_t*, hb_buffer_t*) -->
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_font_t*' -->
@@ -27755,7 +27742,7 @@
           <!-- void OT::hb_apply_context_t::set_lookup_props(unsigned int) -->
           <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -27764,35 +27751,35 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ContextClosureFuncs -->
-      <class-decl name='ContextClosureFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='631' column='1' id='type-id-1887'>
+      <class-decl name='ContextClosureFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='631' column='1' id='type-id-1885'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::intersects_func_t OT::ContextClosureFuncs::intersects -->
-          <var-decl name='intersects' type-id='type-id-1888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='632' column='1'/>
+          <var-decl name='intersects' type-id='type-id-1886' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='632' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::ContextCollectGlyphsFuncs -->
-      <class-decl name='ContextCollectGlyphsFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='635' column='1' id='type-id-1889'>
+      <class-decl name='ContextCollectGlyphsFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='635' column='1' id='type-id-1887'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::collect_glyphs_func_t OT::ContextCollectGlyphsFuncs::collect -->
-          <var-decl name='collect' type-id='type-id-1890' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='636' column='1'/>
+          <var-decl name='collect' type-id='type-id-1888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='636' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::ContextApplyFuncs -->
-      <class-decl name='ContextApplyFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='639' column='1' id='type-id-1891'>
+      <class-decl name='ContextApplyFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='639' column='1' id='type-id-1889'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::match_func_t OT::ContextApplyFuncs::match -->
-          <var-decl name='match' type-id='type-id-1892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='640' column='1'/>
+          <var-decl name='match' type-id='type-id-1890' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='640' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::LookupRecord -->
-      <class-decl name='LookupRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='947' column='1' id='type-id-858'>
+      <class-decl name='LookupRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='947' column='1' id='type-id-856'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::LookupRecord::sequenceIndex -->
-          <var-decl name='sequenceIndex' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='953' column='1'/>
+          <var-decl name='sequenceIndex' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='953' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::LookupRecord::lookupListIndex -->
-          <var-decl name='lookupListIndex' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='955' column='1'/>
+          <var-decl name='lookupListIndex' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='955' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LookupRecord::static_size -->
@@ -27804,10 +27791,10 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ContextClosureLookupContext -->
-      <class-decl name='ContextClosureLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1059' column='1' id='type-id-1112'>
+      <class-decl name='ContextClosureLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1059' column='1' id='type-id-1110'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::ContextClosureFuncs OT::ContextClosureLookupContext::funcs -->
-          <var-decl name='funcs' type-id='type-id-1887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1060' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1060' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- void* OT::ContextClosureLookupContext::intersects_data -->
@@ -27815,10 +27802,10 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ContextCollectGlyphsLookupContext -->
-      <class-decl name='ContextCollectGlyphsLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1065' column='1' id='type-id-1114'>
+      <class-decl name='ContextCollectGlyphsLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1065' column='1' id='type-id-1112'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::ContextCollectGlyphsFuncs OT::ContextCollectGlyphsLookupContext::funcs -->
-          <var-decl name='funcs' type-id='type-id-1889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1066' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1066' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- void* OT::ContextCollectGlyphsLookupContext::collect_data -->
@@ -27826,10 +27813,10 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ContextApplyLookupContext -->
-      <class-decl name='ContextApplyLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1071' column='1' id='type-id-1110'>
+      <class-decl name='ContextApplyLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1071' column='1' id='type-id-1108'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::ContextApplyFuncs OT::ContextApplyLookupContext::funcs -->
-          <var-decl name='funcs' type-id='type-id-1891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1072' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1072' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- void* OT::ContextApplyLookupContext::match_data -->
@@ -27837,22 +27824,22 @@
         </data-member>
       </class-decl>
       <!-- struct OT::Rule -->
-      <class-decl name='Rule' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1135' column='1' id='type-id-1294'>
+      <class-decl name='Rule' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1135' column='1' id='type-id-1292'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::Rule::inputCount -->
-          <var-decl name='inputCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1181' column='1'/>
+          <var-decl name='inputCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1181' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::Rule::lookupCount -->
-          <var-decl name='lookupCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1184' column='1'/>
+          <var-decl name='lookupCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1184' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::Rule::inputZ[1] -->
-          <var-decl name='inputZ' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1185' column='1'/>
+          <var-decl name='inputZ' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1185' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::LookupRecord OT::Rule::lookupRecordX[1] -->
-          <var-decl name='lookupRecordX' type-id='type-id-859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1187' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1187' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Rule::min_size -->
@@ -27864,9 +27851,9 @@
             <!-- implicit parameter of type 'const OT::Rule*' -->
             <parameter type-id='type-id-1718' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- parameter of type 'OT::ContextClosureLookupContext&' -->
-            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-1111'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -27877,9 +27864,9 @@
             <!-- implicit parameter of type 'const OT::Rule*' -->
             <parameter type-id='type-id-1718' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
-            <parameter type-id='type-id-1111'/>
+            <parameter type-id='type-id-1109'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -27888,9 +27875,9 @@
           <!-- bool OT::Rule::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT4Rule8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Rule*' -->
-            <parameter type-id='type-id-1296' is-artificial='yes'/>
+            <parameter type-id='type-id-1294' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -27901,9 +27888,9 @@
             <!-- implicit parameter of type 'const OT::Rule*' -->
             <parameter type-id='type-id-1718' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
-            <parameter type-id='type-id-1111'/>
+            <parameter type-id='type-id-1109'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -27914,19 +27901,19 @@
             <!-- implicit parameter of type 'const OT::Rule*' -->
             <parameter type-id='type-id-1718' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- parameter of type 'OT::ContextCollectGlyphsLookupContext&' -->
-            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1113'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::RuleSet -->
-      <class-decl name='RuleSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1194' column='1' id='type-id-1297'>
+      <class-decl name='RuleSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1194' column='1' id='type-id-1295'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetArrayOf<OT::Rule> OT::RuleSet::rule -->
-          <var-decl name='rule' type-id='type-id-1837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1242' column='1'/>
+          <var-decl name='rule' type-id='type-id-1835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1242' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::RuleSet::min_size -->
@@ -27936,9 +27923,9 @@
           <!-- bool OT::RuleSet::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7RuleSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1235' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::RuleSet*' -->
-            <parameter type-id='type-id-1299' is-artificial='yes'/>
+            <parameter type-id='type-id-1297' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -27949,9 +27936,9 @@
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
             <parameter type-id='type-id-1721' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
-            <parameter type-id='type-id-1111'/>
+            <parameter type-id='type-id-1109'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -27962,9 +27949,9 @@
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
             <parameter type-id='type-id-1721' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- parameter of type 'OT::ContextClosureLookupContext&' -->
-            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-1111'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -27975,9 +27962,9 @@
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
             <parameter type-id='type-id-1721' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- parameter of type 'OT::ContextCollectGlyphsLookupContext&' -->
-            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1113'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -27988,27 +27975,27 @@
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
             <parameter type-id='type-id-1721' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
-            <parameter type-id='type-id-1111'/>
+            <parameter type-id='type-id-1109'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ContextFormat1 -->
-      <class-decl name='ContextFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1116'>
+      <class-decl name='ContextFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1114'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1323' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1323' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ContextFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1325' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1325' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::RuleSet> OT::ContextFormat1::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat1::min_size -->
@@ -28020,7 +28007,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
             <parameter type-id='type-id-1484' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28029,7 +28016,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
             <parameter type-id='type-id-1484' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28040,7 +28027,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
             <parameter type-id='type-id-1484' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28049,9 +28036,9 @@
           <!-- bool OT::ContextFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT14ContextFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1317' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1117' is-artificial='yes'/>
+            <parameter type-id='type-id-1115' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28062,7 +28049,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
             <parameter type-id='type-id-1484' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28073,29 +28060,29 @@
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
             <parameter type-id='type-id-1484' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ContextFormat2 -->
-      <class-decl name='ContextFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1118'>
+      <class-decl name='ContextFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1116'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat2::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1415' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1415' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ContextFormat2::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1417' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1417' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::ContextFormat2::classDef -->
-          <var-decl name='classDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1420' column='1'/>
+          <var-decl name='classDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1420' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetArrayOf<OT::RuleSet> OT::ContextFormat2::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat2::min_size -->
@@ -28107,7 +28094,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
             <parameter type-id='type-id-1487' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28116,7 +28103,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
             <parameter type-id='type-id-1487' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28125,9 +28112,9 @@
           <!-- bool OT::ContextFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT14ContextFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1409' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1119' is-artificial='yes'/>
+            <parameter type-id='type-id-1117' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28138,7 +28125,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
             <parameter type-id='type-id-1487' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28149,7 +28136,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
             <parameter type-id='type-id-1487' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28160,33 +28147,33 @@
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
             <parameter type-id='type-id-1487' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ContextFormat3 -->
-      <class-decl name='ContextFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-1120'>
+      <class-decl name='ContextFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-1118'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat3::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1510' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1510' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::ContextFormat3::glyphCount -->
-          <var-decl name='glyphCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1511' column='1'/>
+          <var-decl name='glyphCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1511' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::ContextFormat3::lookupCount -->
-          <var-decl name='lookupCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1513' column='1'/>
+          <var-decl name='lookupCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1513' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ContextFormat3::coverageZ[1] -->
-          <var-decl name='coverageZ' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
+          <var-decl name='coverageZ' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::LookupRecord OT::ContextFormat3::lookupRecordX[1] -->
-          <var-decl name='lookupRecordX' type-id='type-id-859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat3::min_size -->
@@ -28196,18 +28183,18 @@
           <!-- const OT::Coverage& OT::ContextFormat3::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat312get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1478' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
-            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::ContextFormat3::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1432' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
-            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28216,9 +28203,9 @@
           <!-- bool OT::ContextFormat3::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat311would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
-            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28227,9 +28214,9 @@
           <!-- bool OT::ContextFormat3::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT14ContextFormat38sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1497' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ContextFormat3*' -->
-            <parameter type-id='type-id-1121' is-artificial='yes'/>
+            <parameter type-id='type-id-1119' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28238,9 +28225,9 @@
           <!-- bool OT::ContextFormat3::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat35applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1483' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
-            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28249,40 +28236,40 @@
           <!-- void OT::ContextFormat3::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat314collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1449' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
-            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Context -->
-      <class-decl name='Context' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-1108'>
+      <class-decl name='Context' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-1106'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ContextFormat1 format1; OT::ContextFormat2 format2; OT::ContextFormat3 format3;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1893'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1891'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ContextFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1116' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
+              <var-decl name='format1' type-id='type-id-1114' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ContextFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1118' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
+              <var-decl name='format2' type-id='type-id-1116' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ContextFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-1120' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
+              <var-decl name='format3' type-id='type-id-1118' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ContextFormat1 format1; OT::ContextFormat2 format2; OT::ContextFormat3 format3;} OT::Context::u -->
-          <var-decl name='u' type-id='type-id-1893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
+          <var-decl name='u' type-id='type-id-1891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::Context::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
@@ -28290,9 +28277,9 @@
             <!-- implicit parameter of type 'const OT::Context*' -->
             <parameter type-id='type-id-1481' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28301,9 +28288,9 @@
             <!-- implicit parameter of type 'const OT::Context*' -->
             <parameter type-id='type-id-1481' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28312,9 +28299,9 @@
             <!-- implicit parameter of type 'const OT::Context*' -->
             <parameter type-id='type-id-1481' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28323,18 +28310,18 @@
             <!-- implicit parameter of type 'const OT::Context*' -->
             <parameter type-id='type-id-1481' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::Context::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT7Context8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1537' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Context*' -->
-            <parameter type-id='type-id-1109' is-artificial='yes'/>
+            <parameter type-id='type-id-1107' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28345,9 +28332,9 @@
             <!-- implicit parameter of type 'const OT::Context*' -->
             <parameter type-id='type-id-1481' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28356,62 +28343,62 @@
             <!-- implicit parameter of type 'const OT::Context*' -->
             <parameter type-id='type-id-1481' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ChainContextClosureLookupContext -->
-      <class-decl name='ChainContextClosureLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1561' column='1' id='type-id-1085'>
+      <class-decl name='ChainContextClosureLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1561' column='1' id='type-id-1083'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::ContextClosureFuncs OT::ChainContextClosureLookupContext::funcs -->
-          <var-decl name='funcs' type-id='type-id-1887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1562' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1562' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- void* OT::ChainContextClosureLookupContext::intersects_data[3] -->
-          <var-decl name='intersects_data' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1563' column='1'/>
+          <var-decl name='intersects_data' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1563' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::ChainContextCollectGlyphsLookupContext -->
-      <class-decl name='ChainContextCollectGlyphsLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1567' column='1' id='type-id-1087'>
+      <class-decl name='ChainContextCollectGlyphsLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1567' column='1' id='type-id-1085'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::ContextCollectGlyphsFuncs OT::ChainContextCollectGlyphsLookupContext::funcs -->
-          <var-decl name='funcs' type-id='type-id-1889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1568' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1568' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- void* OT::ChainContextCollectGlyphsLookupContext::collect_data[3] -->
-          <var-decl name='collect_data' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1569' column='1'/>
+          <var-decl name='collect_data' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1569' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::ChainContextApplyLookupContext -->
-      <class-decl name='ChainContextApplyLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1573' column='1' id='type-id-1083'>
+      <class-decl name='ChainContextApplyLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1573' column='1' id='type-id-1081'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::ContextApplyFuncs OT::ChainContextApplyLookupContext::funcs -->
-          <var-decl name='funcs' type-id='type-id-1891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1574' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1574' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- void* OT::ChainContextApplyLookupContext::match_data[3] -->
-          <var-decl name='match_data' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1575' column='1'/>
+          <var-decl name='match_data' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1575' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::ChainRule -->
-      <class-decl name='ChainRule' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1674' column='1' id='type-id-1095'>
+      <class-decl name='ChainRule' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1674' column='1' id='type-id-1093'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ChainRule::backtrack -->
-          <var-decl name='backtrack' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1742' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1742' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ChainRule::inputX -->
-          <var-decl name='inputX' type-id='type-id-1166' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1746' column='1'/>
+          <var-decl name='inputX' type-id='type-id-1164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1746' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ChainRule::lookaheadX -->
-          <var-decl name='lookaheadX' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1749' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1749' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > OT::ChainRule::lookupX -->
-          <var-decl name='lookupX' type-id='type-id-1020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1752' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1752' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainRule::min_size -->
@@ -28423,9 +28410,9 @@
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
             <parameter type-id='type-id-1470' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- parameter of type 'OT::ChainContextClosureLookupContext&' -->
-            <parameter type-id='type-id-1086'/>
+            <parameter type-id='type-id-1084'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28436,9 +28423,9 @@
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
             <parameter type-id='type-id-1470' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1082'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28447,9 +28434,9 @@
           <!-- bool OT::ChainRule::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9ChainRule8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1729' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ChainRule*' -->
-            <parameter type-id='type-id-1097' is-artificial='yes'/>
+            <parameter type-id='type-id-1095' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28460,9 +28447,9 @@
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
             <parameter type-id='type-id-1470' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1082'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28473,19 +28460,19 @@
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
             <parameter type-id='type-id-1470' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- parameter of type 'OT::ChainContextCollectGlyphsLookupContext&' -->
-            <parameter type-id='type-id-1088'/>
+            <parameter type-id='type-id-1086'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ChainRuleSet -->
-      <class-decl name='ChainRuleSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1759' column='1' id='type-id-1098'>
+      <class-decl name='ChainRuleSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1759' column='1' id='type-id-1096'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetArrayOf<OT::ChainRule> OT::ChainRuleSet::rule -->
-          <var-decl name='rule' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1805' column='1'/>
+          <var-decl name='rule' type-id='type-id-1826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1805' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainRuleSet::min_size -->
@@ -28495,9 +28482,9 @@
           <!-- bool OT::ChainRuleSet::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12ChainRuleSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1798' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
+            <parameter type-id='type-id-1098' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28508,9 +28495,9 @@
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
             <parameter type-id='type-id-1473' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1082'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28521,9 +28508,9 @@
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
             <parameter type-id='type-id-1473' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- parameter of type 'OT::ChainContextClosureLookupContext&' -->
-            <parameter type-id='type-id-1086'/>
+            <parameter type-id='type-id-1084'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28534,9 +28521,9 @@
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
             <parameter type-id='type-id-1473' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- parameter of type 'OT::ChainContextCollectGlyphsLookupContext&' -->
-            <parameter type-id='type-id-1088'/>
+            <parameter type-id='type-id-1086'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28547,27 +28534,27 @@
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
             <parameter type-id='type-id-1473' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1082'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ChainContextFormat1 -->
-      <class-decl name='ChainContextFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1089'>
+      <class-decl name='ChainContextFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1087'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1883' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1883' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ChainContextFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1885' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1885' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::ChainRuleSet> OT::ChainContextFormat1::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1827' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat1::min_size -->
@@ -28579,7 +28566,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
             <parameter type-id='type-id-1461' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28588,7 +28575,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
             <parameter type-id='type-id-1461' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28599,7 +28586,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
             <parameter type-id='type-id-1461' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28608,9 +28595,9 @@
           <!-- bool OT::ChainContextFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT19ChainContextFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1877' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
+            <parameter type-id='type-id-1088' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28621,7 +28608,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
             <parameter type-id='type-id-1461' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28632,37 +28619,37 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
             <parameter type-id='type-id-1461' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ChainContextFormat2 -->
-      <class-decl name='ChainContextFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1091'>
+      <class-decl name='ChainContextFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1089'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat2::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1995' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1995' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ChainContextFormat2::coverage -->
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1997' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1997' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::ChainContextFormat2::backtrackClassDef -->
-          <var-decl name='backtrackClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2000' column='1'/>
+          <var-decl name='backtrackClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2000' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::ChainContextFormat2::inputClassDef -->
-          <var-decl name='inputClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2004' column='1'/>
+          <var-decl name='inputClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2004' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::ChainContextFormat2::lookaheadClassDef -->
-          <var-decl name='lookaheadClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2008' column='1'/>
+          <var-decl name='lookaheadClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2008' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetArrayOf<OT::ChainRuleSet> OT::ChainContextFormat2::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1827' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat2::min_size -->
@@ -28674,7 +28661,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
             <parameter type-id='type-id-1464' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28683,7 +28670,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
             <parameter type-id='type-id-1464' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28692,9 +28679,9 @@
           <!-- bool OT::ChainContextFormat2::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT19ChainContextFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1987' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1092' is-artificial='yes'/>
+            <parameter type-id='type-id-1090' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28705,7 +28692,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
             <parameter type-id='type-id-1464' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28716,7 +28703,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
             <parameter type-id='type-id-1464' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28727,33 +28714,33 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
             <parameter type-id='type-id-1464' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ChainContextFormat3 -->
-      <class-decl name='ChainContextFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1093'>
+      <class-decl name='ChainContextFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1091'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat3::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2121' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::backtrack -->
-          <var-decl name='backtrack' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::inputX -->
-          <var-decl name='inputX' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
+          <var-decl name='inputX' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::lookaheadX -->
-          <var-decl name='lookaheadX' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
           <!-- OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > OT::ChainContextFormat3::lookupX -->
-          <var-decl name='lookupX' type-id='type-id-1020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat3::min_size -->
@@ -28765,7 +28752,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
             <parameter type-id='type-id-1467' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28774,7 +28761,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
             <parameter type-id='type-id-1467' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -28785,7 +28772,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
             <parameter type-id='type-id-1467' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28794,9 +28781,9 @@
           <!-- bool OT::ChainContextFormat3::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT19ChainContextFormat38sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1094' is-artificial='yes'/>
+            <parameter type-id='type-id-1092' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28807,7 +28794,7 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
             <parameter type-id='type-id-1467' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28818,38 +28805,38 @@
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
             <parameter type-id='type-id-1467' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ChainContext -->
-      <class-decl name='ChainContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-1081'>
+      <class-decl name='ChainContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-1079'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ChainContextFormat1 format1; OT::ChainContextFormat2 format2; OT::ChainContextFormat3 format3;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1894'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1892'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ChainContextFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1089' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
+              <var-decl name='format1' type-id='type-id-1087' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ChainContextFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1091' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
+              <var-decl name='format2' type-id='type-id-1089' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ChainContextFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-1093' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
+              <var-decl name='format3' type-id='type-id-1091' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ChainContextFormat1 format1; OT::ChainContextFormat2 format2; OT::ChainContextFormat3 format3;} OT::ChainContext::u -->
-          <var-decl name='u' type-id='type-id-1894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
+          <var-decl name='u' type-id='type-id-1892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::ChainContext::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
@@ -28857,9 +28844,9 @@
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
             <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28868,9 +28855,9 @@
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
             <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28879,9 +28866,9 @@
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
             <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28890,18 +28877,18 @@
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
             <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::ChainContext::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT12ChainContext8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2155' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ChainContext*' -->
-            <parameter type-id='type-id-1082' is-artificial='yes'/>
+            <parameter type-id='type-id-1080' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -28912,9 +28899,9 @@
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
             <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28923,25 +28910,25 @@
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
             <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ExtensionFormat1 -->
-      <class-decl name='ExtensionFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-1144'>
+      <class-decl name='ExtensionFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-1142'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ExtensionFormat1::format -->
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2187' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2187' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::ExtensionFormat1::extensionLookupType -->
-          <var-decl name='extensionLookupType' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2188' column='1'/>
+          <var-decl name='extensionLookupType' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2188' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ULONG OT::ExtensionFormat1::extensionOffset -->
-          <var-decl name='extensionOffset' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2191' column='1'/>
+          <var-decl name='extensionOffset' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2191' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ExtensionFormat1::static_size -->
@@ -28955,7 +28942,7 @@
           <!-- unsigned int OT::ExtensionFormat1::get_type() -->
           <function-decl name='get_type' mangled-name='_ZNK2OT16ExtensionFormat18get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2178' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ExtensionFormat1*' -->
-            <parameter type-id='type-id-505' is-artificial='yes'/>
+            <parameter type-id='type-id-503' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -28964,7 +28951,7 @@
           <!-- unsigned int OT::ExtensionFormat1::get_offset() -->
           <function-decl name='get_offset' mangled-name='_ZNK2OT16ExtensionFormat110get_offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2179' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ExtensionFormat1*' -->
-            <parameter type-id='type-id-505' is-artificial='yes'/>
+            <parameter type-id='type-id-503' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -28973,19 +28960,19 @@
           <!-- bool OT::ExtensionFormat1::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT16ExtensionFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ExtensionFormat1*' -->
-            <parameter type-id='type-id-1145' is-artificial='yes'/>
+            <parameter type-id='type-id-1143' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Extension<OT::ExtensionPos> -->
-      <class-decl name='Extension&lt;OT::ExtensionPos&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1140'>
+      <class-decl name='Extension&lt;OT::ExtensionPos&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1138'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} OT::Extension<OT::ExtensionPos>::u -->
-          <var-decl name='u' type-id='type-id-1895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
+          <var-decl name='u' type-id='type-id-1893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- const OT::PosLookupSubTable& OT::Extension<OT::ExtensionPos>::get_subtable<OT::PosLookupSubTable>() -->
@@ -29002,9 +28989,9 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
             <parameter type-id='type-id-1509' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29029,9 +29016,9 @@
           <!-- bool OT::Extension<OT::ExtensionPos>::sanitize_self(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_self' mangled-name='_ZN2OT9ExtensionINS_12ExtensionPosEE13sanitize_selfEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1141' is-artificial='yes'/>
+            <parameter type-id='type-id-1139' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -29042,9 +29029,9 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
             <parameter type-id='type-id-1509' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29053,41 +29040,41 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
             <parameter type-id='type-id-1509' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::Extension<OT::ExtensionPos>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9ExtensionINS_12ExtensionPosEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1141' is-artificial='yes'/>
+            <parameter type-id='type-id-1139' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Extension<OT::ExtensionSubst> -->
-      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1142'>
+      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1140'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1895'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1893'>
             <data-member access='public'>
               <!-- OT::USHORT format -->
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ExtensionFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1144' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
+              <var-decl name='format1' type-id='type-id-1142' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} OT::Extension<OT::ExtensionSubst>::u -->
-          <var-decl name='u' type-id='type-id-1895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
+          <var-decl name='u' type-id='type-id-1893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- const OT::SubstLookupSubTable& OT::Extension<OT::ExtensionSubst>::get_subtable<OT::SubstLookupSubTable>() -->
@@ -29104,9 +29091,9 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
             <parameter type-id='type-id-1511' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29115,9 +29102,9 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
             <parameter type-id='type-id-1511' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29126,9 +29113,9 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
             <parameter type-id='type-id-1511' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29137,9 +29124,9 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
             <parameter type-id='type-id-1511' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29148,9 +29135,9 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
             <parameter type-id='type-id-1511' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29175,9 +29162,9 @@
           <!-- bool OT::Extension<OT::ExtensionSubst>::sanitize_self(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize_self' mangled-name='_ZN2OT9ExtensionINS_14ExtensionSubstEE13sanitize_selfEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1143' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -29186,9 +29173,9 @@
           <!-- bool OT::Extension<OT::ExtensionSubst>::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT9ExtensionINS_14ExtensionSubstEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1143' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -29208,37 +29195,37 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
             <parameter type-id='type-id-1511' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::GSUBGPOS -->
-      <class-decl name='GSUBGPOS' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2259' column='1' id='type-id-1164'>
+      <class-decl name='GSUBGPOS' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2259' column='1' id='type-id-1162'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::GSUBGPOS::GSUBTag -->
-          <var-decl name='GSUBTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2260' column='1'/>
+          <var-decl name='GSUBTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2260' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::GSUBGPOS::GPOSTag -->
-          <var-decl name='GPOSTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2261' column='1'/>
+          <var-decl name='GPOSTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2261' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::FixedVersion OT::GSUBGPOS::version -->
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2303' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2303' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > OT::GSUBGPOS::scriptList -->
-          <var-decl name='scriptList' type-id='type-id-1253' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2306' column='1'/>
+          <var-decl name='scriptList' type-id='type-id-1251' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2306' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > OT::GSUBGPOS::featureList -->
-          <var-decl name='featureList' type-id='type-id-1252' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2308' column='1'/>
+          <var-decl name='featureList' type-id='type-id-1250' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2308' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > OT::GSUBGPOS::lookupList -->
-          <var-decl name='lookupList' type-id='type-id-1246' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2310' column='1'/>
+          <var-decl name='lookupList' type-id='type-id-1244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2310' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GSUBGPOS::static_size -->
@@ -29289,7 +29276,7 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_tag_t*' -->
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -29304,7 +29291,7 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- parameter of type 'hb_tag_t*' -->
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <!-- unsigned int -->
             <return type-id='type-id-12'/>
           </function-decl>
@@ -29324,7 +29311,7 @@
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
             <parameter type-id='type-id-1533' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-59'/>
             <!-- bool -->
@@ -29350,96 +29337,96 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef hb_tag_t -->
-            <return type-id='type-id-187'/>
+            <return type-id='type-id-185'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::GSUBGPOS::sanitize(OT::hb_sanitize_context_t*) -->
           <function-decl name='sanitize' mangled-name='_ZN2OT8GSUBGPOS8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2294' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1165' is-artificial='yes'/>
+            <parameter type-id='type-id-1163' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Supplier<OT::EntryExitRecord> -->
-      <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1319'/>
+      <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1317'/>
       <!-- struct OT::Supplier<OT::Index> -->
-      <class-decl name='Supplier&lt;OT::Index&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1321'/>
+      <class-decl name='Supplier&lt;OT::Index&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1319'/>
       <!-- struct OT::Supplier<OT::IntType<unsigned int, 3u> > -->
-      <class-decl name='Supplier&lt;OT::IntType&lt;unsigned int, 3u&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1323'/>
+      <class-decl name='Supplier&lt;OT::IntType&lt;unsigned int, 3u&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1321'/>
       <!-- struct OT::Supplier<OT::LookupRecord> -->
-      <class-decl name='Supplier&lt;OT::LookupRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1325'/>
+      <class-decl name='Supplier&lt;OT::LookupRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1323'/>
       <!-- struct OT::Supplier<OT::MarkRecord> -->
-      <class-decl name='Supplier&lt;OT::MarkRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1327'/>
+      <class-decl name='Supplier&lt;OT::MarkRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1325'/>
       <!-- struct OT::Supplier<OT::Offset<OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1329'/>
+      <class-decl name='Supplier&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1327'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1331'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1329'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1333'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1331'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1335'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1333'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1337'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1335'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1339'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1337'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1341'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1339'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1343'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1341'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1345'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1343'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1347'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1345'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1349'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1347'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1351'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1349'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1353'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1351'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1355'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1353'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1357'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1355'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1359'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1357'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1361'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1359'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1363'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1361'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1365'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1363'/>
       <!-- struct OT::Supplier<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1367'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1365'/>
       <!-- struct OT::Supplier<OT::RangeRecord> -->
-      <class-decl name='Supplier&lt;OT::RangeRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1369'/>
+      <class-decl name='Supplier&lt;OT::RangeRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1367'/>
       <!-- struct OT::Supplier<OT::Record<OT::Feature> > -->
-      <class-decl name='Supplier&lt;OT::Record&lt;OT::Feature&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1371'/>
+      <class-decl name='Supplier&lt;OT::Record&lt;OT::Feature&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1369'/>
       <!-- struct OT::Supplier<OT::Record<OT::LangSys> > -->
-      <class-decl name='Supplier&lt;OT::Record&lt;OT::LangSys&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1373'/>
+      <class-decl name='Supplier&lt;OT::Record&lt;OT::LangSys&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1371'/>
       <!-- struct OT::Supplier<OT::Record<OT::Script> > -->
-      <class-decl name='Supplier&lt;OT::Record&lt;OT::Script&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1375'/>
+      <class-decl name='Supplier&lt;OT::Record&lt;OT::Script&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1373'/>
       <!-- struct OT::Supplier<unsigned int> -->
-      <class-decl name='Supplier&lt;unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-1377'>
+      <class-decl name='Supplier&lt;unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-1375'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- unsigned int OT::Supplier<unsigned int>::len -->
           <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='511' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- const unsigned int* OT::Supplier<unsigned int>::head -->
-          <var-decl name='head' type-id='type-id-1896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
+          <var-decl name='head' type-id='type-id-1894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::Supplier<unsigned int>::Supplier(const unsigned int*, unsigned int) -->
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<unsigned int>*' -->
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned int*' -->
-            <parameter type-id='type-id-1896'/>
+            <parameter type-id='type-id-1894'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -29450,9 +29437,9 @@
           <!-- void OT::Supplier<unsigned int>::Supplier(const OT::Supplier<unsigned int>&) -->
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<unsigned int>*' -->
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1898'/>
+            <parameter type-id='type-id-1896'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -29461,7 +29448,7 @@
           <!-- const unsigned int OT::Supplier<unsigned int>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierIjEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Supplier<unsigned int>*' -->
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const unsigned int -->
@@ -29472,7 +29459,7 @@
           <!-- void OT::Supplier<unsigned int>::advance(unsigned int) -->
           <function-decl name='advance' mangled-name='_ZN2OT8SupplierIjE7advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<unsigned int>*' -->
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -29481,47 +29468,47 @@
         </member-function>
       </class-decl>
       <!-- typedef OT::USHORT OT::Value -->
-      <typedef-decl name='Value' type-id='type-id-373' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-914'/>
+      <typedef-decl name='Value' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-912'/>
       <!-- typedef Value[1] OT::ValueRecord -->
-      <typedef-decl name='ValueRecord' type-id='type-id-915' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1852'/>
+      <typedef-decl name='ValueRecord' type-id='type-id-913' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1850'/>
       <!-- typedef bool (hb_set_t*, const OT::USHORT&, void*)* OT::intersects_func_t -->
-      <typedef-decl name='intersects_func_t' type-id='type-id-1399' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1888'/>
+      <typedef-decl name='intersects_func_t' type-id='type-id-1399' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1886'/>
       <!-- typedef void (hb_set_t*, const OT::USHORT&, void*)* OT::collect_glyphs_func_t -->
-      <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1815' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1890'/>
+      <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1813' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1888'/>
       <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::match_func_t -->
-      <typedef-decl name='match_func_t' type-id='type-id-1401' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='628' column='1' id='type-id-1892'/>
+      <typedef-decl name='match_func_t' type-id='type-id-1401' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='628' column='1' id='type-id-1890'/>
     </namespace-decl>
     <!-- hb_bool_t hb_ot_layout_has_glyph_classes(hb_face_t*) -->
     <function-decl name='hb_ot_layout_has_glyph_classes' mangled-name='hb_ot_layout_has_glyph_classes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_glyph_classes'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='126' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='126' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- hb_ot_layout_glyph_class_t hb_ot_layout_get_glyph_class(hb_face_t*, hb_codepoint_t) -->
     <function-decl name='hb_ot_layout_get_glyph_class' mangled-name='hb_ot_layout_get_glyph_class' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_glyph_class'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='133' column='1'/>
       <!-- enum hb_ot_layout_glyph_class_t -->
-      <return type-id='type-id-948'/>
+      <return type-id='type-id-946'/>
     </function-decl>
     <!-- void hb_ot_layout_get_glyphs_in_class(hb_face_t*, hb_ot_layout_glyph_class_t, hb_set_t*) -->
     <function-decl name='hb_ot_layout_get_glyphs_in_class' mangled-name='hb_ot_layout_get_glyphs_in_class' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_glyphs_in_class'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1'/>
       <!-- parameter of type 'enum hb_ot_layout_glyph_class_t' -->
-      <parameter type-id='type-id-948' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='140' column='1'/>
+      <parameter type-id='type-id-946' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='140' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='141' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='141' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- unsigned int hb_ot_layout_get_attach_points(hb_face_t*, hb_codepoint_t, unsigned int, unsigned int*, unsigned int*) -->
     <function-decl name='hb_ot_layout_get_attach_points' mangled-name='hb_ot_layout_get_attach_points' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_attach_points'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='148' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29546,33 +29533,33 @@
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='caret_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='161' column='1'/>
       <!-- parameter of type 'int*' -->
-      <parameter type-id='type-id-577' name='caret_array' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='162' column='1'/>
+      <parameter type-id='type-id-575' name='caret_array' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='162' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- unsigned int hb_ot_layout_table_get_script_tags(hb_face_t*, hb_tag_t, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_table_get_script_tags' mangled-name='hb_ot_layout_table_get_script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_script_tags'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='185' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='185' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='186' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='186' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='187' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='script_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='188' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
-      <parameter type-id='type-id-967' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='189' column='1'/>
+      <parameter type-id='type-id-965' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='189' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_table_find_script(hb_face_t*, hb_tag_t, hb_tag_t, unsigned int*) -->
     <function-decl name='hb_ot_layout_table_find_script' mangled-name='hb_ot_layout_table_find_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_find_script'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='200' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='200' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='script_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='201' column='1'/>
+      <parameter type-id='type-id-185' name='script_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='201' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='202' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -29581,39 +29568,39 @@
     <!-- hb_bool_t hb_ot_layout_table_choose_script(hb_face_t*, hb_tag_t, const hb_tag_t*, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_table_choose_script' mangled-name='hb_ot_layout_table_choose_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_choose_script'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1804' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
+      <parameter type-id='type-id-1808' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='232' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
-      <parameter type-id='type-id-967' name='chosen_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='233' column='1'/>
+      <parameter type-id='type-id-965' name='chosen_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='233' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- unsigned int hb_ot_layout_table_get_feature_tags(hb_face_t*, hb_tag_t, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_table_get_feature_tags' mangled-name='hb_ot_layout_table_get_feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_feature_tags'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='278' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='278' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='279' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='feature_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='280' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
-      <parameter type-id='type-id-967' name='feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='281' column='1'/>
+      <parameter type-id='type-id-965' name='feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='281' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- unsigned int hb_ot_layout_script_get_language_tags(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_script_get_language_tags' mangled-name='hb_ot_layout_script_get_language_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_script_get_language_tags'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='291' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='291' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='292' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29621,20 +29608,20 @@
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='language_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='294' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
-      <parameter type-id='type-id-967' name='language_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='295' column='1'/>
+      <parameter type-id='type-id-965' name='language_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='295' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_script_find_language(hb_face_t*, hb_tag_t, unsigned int, hb_tag_t, unsigned int*) -->
     <function-decl name='hb_ot_layout_script_find_language' mangled-name='hb_ot_layout_script_find_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_script_find_language'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='304' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='304' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='305' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='language_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='306' column='1'/>
+      <parameter type-id='type-id-185' name='language_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='306' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='307' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -29643,9 +29630,9 @@
     <!-- hb_bool_t hb_ot_layout_language_get_required_feature_index(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*) -->
     <function-decl name='hb_ot_layout_language_get_required_feature_index' mangled-name='hb_ot_layout_language_get_required_feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature_index'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='325' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='325' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='326' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29658,9 +29645,9 @@
     <!-- hb_bool_t hb_ot_layout_language_get_required_feature(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_language_get_required_feature' mangled-name='hb_ot_layout_language_get_required_feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='340' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='340' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='341' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29668,16 +29655,16 @@
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='343' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
-      <parameter type-id='type-id-967' name='feature_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='344' column='1'/>
+      <parameter type-id='type-id-965' name='feature_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='344' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- unsigned int hb_ot_layout_language_get_feature_indexes(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int, unsigned int*, unsigned int*) -->
     <function-decl name='hb_ot_layout_language_get_feature_indexes' mangled-name='hb_ot_layout_language_get_feature_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_feature_indexes'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='358' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='358' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='359' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29694,9 +29681,9 @@
     <!-- unsigned int hb_ot_layout_language_get_feature_tags(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_language_get_feature_tags' mangled-name='hb_ot_layout_language_get_feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_feature_tags'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='373' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='373' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='374' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29706,22 +29693,22 @@
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='feature_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='377' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
-      <parameter type-id='type-id-967' name='feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='378' column='1'/>
+      <parameter type-id='type-id-965' name='feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='378' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_language_find_feature(hb_face_t*, hb_tag_t, unsigned int, unsigned int, hb_tag_t, unsigned int*) -->
     <function-decl name='hb_ot_layout_language_find_feature' mangled-name='hb_ot_layout_language_find_feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_find_feature'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='398' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='398' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='399' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='400' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='feature_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='401' column='1'/>
+      <parameter type-id='type-id-185' name='feature_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='401' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='402' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -29730,9 +29717,9 @@
     <!-- unsigned int hb_ot_layout_feature_get_lookups(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*, unsigned int*) -->
     <function-decl name='hb_ot_layout_feature_get_lookups' mangled-name='hb_ot_layout_feature_get_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_feature_get_lookups'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='424' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='424' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='425' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29747,59 +29734,59 @@
     <!-- unsigned int hb_ot_layout_table_get_lookup_count(hb_face_t*, hb_tag_t) -->
     <function-decl name='hb_ot_layout_table_get_lookup_count' mangled-name='hb_ot_layout_table_get_lookup_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_lookup_count'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='438' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='438' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- void hb_ot_layout_collect_lookups(hb_face_t*, hb_tag_t, const hb_tag_t*, const hb_tag_t*, const hb_tag_t*, hb_set_t*) -->
     <function-decl name='hb_ot_layout_collect_lookups' mangled-name='hb_ot_layout_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_collect_lookups'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1804' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
+      <parameter type-id='type-id-1808' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1804' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
+      <parameter type-id='type-id-1808' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1804' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
+      <parameter type-id='type-id-1808' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
+      <parameter type-id='type-id-958' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- void hb_ot_layout_lookup_collect_glyphs(hb_face_t*, hb_tag_t, unsigned int, hb_set_t*, hb_set_t*, hb_set_t*, hb_set_t*) -->
     <function-decl name='hb_ot_layout_lookup_collect_glyphs' mangled-name='hb_ot_layout_lookup_collect_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_collect_glyphs'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='636' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='636' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='637' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='glyphs_input' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='639' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs_input' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='639' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='glyphs_after' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='640' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs_after' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='640' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='glyphs_output' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='641' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs_output' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='641' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_has_substitution(hb_face_t*) -->
     <function-decl name='hb_ot_layout_has_substitution' mangled-name='hb_ot_layout_has_substitution' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_substitution'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='674' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='674' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_lookup_would_substitute(hb_face_t*, unsigned int, const hb_codepoint_t*, unsigned int, hb_bool_t) -->
     <function-decl name='hb_ot_layout_lookup_would_substitute' mangled-name='hb_ot_layout_lookup_would_substitute' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_would_substitute'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='681' column='1'/>
       <!-- parameter of type 'const hb_codepoint_t*' -->
@@ -29814,25 +29801,25 @@
     <!-- void hb_ot_layout_lookup_substitute_closure(hb_face_t*, unsigned int, hb_set_t*) -->
     <function-decl name='hb_ot_layout_lookup_substitute_closure' mangled-name='hb_ot_layout_lookup_substitute_closure' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_substitute_closure'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='719' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='720' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='720' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_has_positioning(hb_face_t*) -->
     <function-decl name='hb_ot_layout_has_positioning' mangled-name='hb_ot_layout_has_positioning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_positioning'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='734' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='734' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_get_size_params(hb_face_t*, unsigned int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*) -->
     <function-decl name='hb_ot_layout_get_size_params' mangled-name='hb_ot_layout_get_size_params' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_size_params'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-59' name='design_size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='753' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
@@ -29847,13 +29834,22 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- typedef const _hb_void_t& hb_void_t -->
-    <typedef-decl name='hb_void_t' type-id='type-id-982' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='259' column='1' id='type-id-1879'/>
+    <typedef-decl name='hb_void_t' type-id='type-id-980' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='259' column='1' id='type-id-1877'/>
     <!-- typedef hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > > hb_set_digest_t -->
-    <typedef-decl name='hb_set_digest_t' type-id='type-id-995' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-931'/>
+    <typedef-decl name='hb_set_digest_t' type-id='type-id-993' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-929'/>
+    <!-- OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int) -->
+    <function-type size-in-bits='64' id='type-id-1396'>
+      <!-- parameter of type 'OT::hb_apply_context_t*' -->
+      <parameter type-id='type-id-1381'/>
+      <!-- parameter of type 'unsigned int' -->
+      <parameter type-id='type-id-12'/>
+      <!-- typedef OT::hb_apply_context_t::return_t -->
+      <return type-id='type-id-1853'/>
+    </function-type>
     <!-- bool (hb_set_t*, const OT::USHORT&, void*) -->
     <function-type size-in-bits='64' id='type-id-1398'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960'/>
+      <parameter type-id='type-id-958'/>
       <!-- parameter of type 'const OT::USHORT&' -->
       <parameter type-id='type-id-1763'/>
       <!-- parameter of type 'void*' -->
@@ -29872,37 +29868,28 @@
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-type>
-    <!-- OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1807'>
-      <!-- parameter of type 'OT::hb_apply_context_t*' -->
-      <parameter type-id='type-id-1383'/>
-      <!-- parameter of type 'unsigned int' -->
-      <parameter type-id='type-id-12'/>
-      <!-- typedef OT::hb_apply_context_t::return_t -->
-      <return type-id='type-id-1855'/>
-    </function-type>
     <!-- OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1809'>
+    <function-type size-in-bits='64' id='type-id-1784'>
       <!-- parameter of type 'OT::hb_closure_context_t*' -->
-      <parameter type-id='type-id-1391'/>
+      <parameter type-id='type-id-1389'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12'/>
       <!-- typedef OT::hb_closure_context_t::return_t -->
-      <return type-id='type-id-1870'/>
+      <return type-id='type-id-1868'/>
     </function-type>
     <!-- OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1811'>
+    <function-type size-in-bits='64' id='type-id-1786'>
       <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-      <parameter type-id='type-id-1393'/>
+      <parameter type-id='type-id-1391'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12'/>
       <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-      <return type-id='type-id-1856'/>
+      <return type-id='type-id-1854'/>
     </function-type>
     <!-- void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
-    <function-type size-in-bits='64' id='type-id-1813'>
+    <function-type size-in-bits='64' id='type-id-1811'>
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
-      <parameter type-id='type-id-958'/>
+      <parameter type-id='type-id-956'/>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147'/>
       <!-- parameter of type 'hb_buffer_t*' -->
@@ -29911,9 +29898,9 @@
       <return type-id='type-id-23'/>
     </function-type>
     <!-- void (hb_set_t*, const OT::USHORT&, void*) -->
-    <function-type size-in-bits='64' id='type-id-1814'>
+    <function-type size-in-bits='64' id='type-id-1812'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960'/>
+      <parameter type-id='type-id-958'/>
       <!-- parameter of type 'const OT::USHORT&' -->
       <parameter type-id='type-id-1763'/>
       <!-- parameter of type 'void*' -->
@@ -29924,22 +29911,22 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- feature_info_t[32] -->
-    <array-type-def dimensions='1' type-id='type-id-1900' size-in-bits='7168' id='type-id-1901'>
+    <array-type-def dimensions='1' type-id='type-id-1898' size-in-bits='7168' id='type-id-1899'>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' type-id='type-id-4' id='type-id-921'/>
+      <subrange length='32' type-id='type-id-4' id='type-id-919'/>
     </array-type-def>
     <!-- stage_info_t[8] -->
-    <array-type-def dimensions='1' type-id='type-id-1902' size-in-bits='1024' id='type-id-1903'>
+    <array-type-def dimensions='1' type-id='type-id-1900' size-in-bits='1024' id='type-id-1901'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>[2] -->
-    <array-type-def dimensions='1' type-id='type-id-1904' size-in-bits='2304' id='type-id-1905'>
+    <array-type-def dimensions='1' type-id='type-id-1902' size-in-bits='2304' id='type-id-1903'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
     <!-- enum hb_ot_map_feature_flags_t -->
-    <enum-decl name='hb_ot_map_feature_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='155' column='1' id='type-id-1906'>
+    <enum-decl name='hb_ot_map_feature_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='155' column='1' id='type-id-1904'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='F_NONE' value='0'/>
       <enumerator name='F_GLOBAL' value='1'/>
@@ -29947,13 +29934,13 @@
       <enumerator name='F_MANUAL_ZWJ' value='4'/>
     </enum-decl>
     <!-- struct hb_ot_map_builder_t -->
-    <class-decl name='hb_ot_map_builder_t' size-in-bits='10240' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='181' column='1' id='type-id-1907'>
+    <class-decl name='hb_ot_map_builder_t' size-in-bits='10240' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='181' column='1' id='type-id-1905'>
       <member-type access='private'>
         <!-- struct hb_ot_map_builder_t::feature_info_t -->
-        <class-decl name='feature_info_t' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='210' column='1' id='type-id-1900'>
+        <class-decl name='feature_info_t' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='210' column='1' id='type-id-1898'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- hb_tag_t hb_ot_map_builder_t::feature_info_t::tag -->
-            <var-decl name='tag' type-id='type-id-187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='211' column='1'/>
+            <var-decl name='tag' type-id='type-id-185' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='211' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- unsigned int hb_ot_map_builder_t::feature_info_t::seq -->
@@ -29965,7 +29952,7 @@
           </data-member>
           <data-member access='public' layout-offset-in-bits='96'>
             <!-- hb_ot_map_feature_flags_t hb_ot_map_builder_t::feature_info_t::flags -->
-            <var-decl name='flags' type-id='type-id-1906' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='214' column='1'/>
+            <var-decl name='flags' type-id='type-id-1904' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='214' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- unsigned int hb_ot_map_builder_t::feature_info_t::default_value -->
@@ -29979,9 +29966,9 @@
             <!-- int hb_ot_map_builder_t::feature_info_t::cmp(const hb_ot_map_builder_t::feature_info_t*) -->
             <function-decl name='cmp' mangled-name='_ZN19hb_ot_map_builder_t14feature_info_t3cmpEPKS0_S2_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- parameter of type 'const hb_ot_map_builder_t::feature_info_t*' -->
-              <parameter type-id='type-id-1908'/>
+              <parameter type-id='type-id-1906'/>
               <!-- parameter of type 'const hb_ot_map_builder_t::feature_info_t*' -->
-              <parameter type-id='type-id-1908'/>
+              <parameter type-id='type-id-1906'/>
               <!-- int -->
               <return type-id='type-id-9'/>
             </function-decl>
@@ -29990,20 +29977,20 @@
       </member-type>
       <member-type access='private'>
         <!-- struct hb_ot_map_builder_t::stage_info_t -->
-        <class-decl name='stage_info_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='222' column='1' id='type-id-1902'>
+        <class-decl name='stage_info_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='222' column='1' id='type-id-1900'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned int hb_ot_map_builder_t::stage_info_t::index -->
             <var-decl name='index' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='223' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- hb_ot_map_t::stage_map_t::pause_func_t hb_ot_map_builder_t::stage_info_t::pause_func -->
-            <var-decl name='pause_func' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='224' column='1'/>
+            <var-decl name='pause_func' type-id='type-id-950' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='224' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_face_t* hb_ot_map_builder_t::face -->
-        <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='231' column='1'/>
+        <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='231' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_segment_properties_t hb_ot_map_builder_t::props -->
@@ -30011,11 +29998,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- hb_tag_t hb_ot_map_builder_t::chosen_script[2] -->
-        <var-decl name='chosen_script' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='234' column='1'/>
+        <var-decl name='chosen_script' type-id='type-id-926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='234' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- bool hb_ot_map_builder_t::found_script[2] -->
-        <var-decl name='found_script' type-id='type-id-916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='235' column='1'/>
+        <var-decl name='found_script' type-id='type-id-914' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='235' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
         <!-- unsigned int hb_ot_map_builder_t::script_index[2] -->
@@ -30031,21 +30018,21 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u> hb_ot_map_builder_t::feature_infos -->
-        <var-decl name='feature_infos' type-id='type-id-1909' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='241' column='1'/>
+        <var-decl name='feature_infos' type-id='type-id-1907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='241' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='7936'>
         <!-- hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u> hb_ot_map_builder_t::stages[2] -->
-        <var-decl name='stages' type-id='type-id-1905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='242' column='1'/>
+        <var-decl name='stages' type-id='type-id-1903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='242' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- hb_ot_map_builder_t::hb_ot_map_builder_t(hb_face_t*, const hb_segment_properties_t*) -->
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'const hb_segment_properties_t*' -->
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-173'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30054,9 +30041,9 @@
         <!-- void hb_ot_map_builder_t::add_gsub_pause(hb_ot_map_t::stage_map_t::pause_func_t) -->
         <function-decl name='add_gsub_pause' mangled-name='_ZN19hb_ot_map_builder_t14add_gsub_pauseEPFvPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_ot_map_t::stage_map_t::pause_func_t' -->
-          <parameter type-id='type-id-952'/>
+          <parameter type-id='type-id-950'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30065,9 +30052,9 @@
         <!-- void hb_ot_map_builder_t::add_gpos_pause(hb_ot_map_t::stage_map_t::pause_func_t) -->
         <function-decl name='add_gpos_pause' mangled-name='_ZN19hb_ot_map_builder_t14add_gpos_pauseEPFvPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_ot_map_t::stage_map_t::pause_func_t' -->
-          <parameter type-id='type-id-952'/>
+          <parameter type-id='type-id-950'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30076,11 +30063,11 @@
         <!-- void hb_ot_map_builder_t::add_pause(unsigned int, hb_ot_map_t::stage_map_t::pause_func_t) -->
         <function-decl name='add_pause' mangled-name='_ZN19hb_ot_map_builder_t9add_pauseEjPFvPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'typedef hb_ot_map_t::stage_map_t::pause_func_t' -->
-          <parameter type-id='type-id-952'/>
+          <parameter type-id='type-id-950'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30089,13 +30076,13 @@
         <!-- void hb_ot_map_builder_t::add_feature(hb_tag_t, unsigned int, hb_ot_map_feature_flags_t) -->
         <function-decl name='add_feature' mangled-name='_ZN19hb_ot_map_builder_t11add_featureEjj25hb_ot_map_feature_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'enum hb_ot_map_feature_flags_t' -->
-          <parameter type-id='type-id-1906'/>
+          <parameter type-id='type-id-1904'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30104,9 +30091,9 @@
         <!-- void hb_ot_map_builder_t::compile(hb_ot_map_t&) -->
         <function-decl name='compile' mangled-name='_ZN19hb_ot_map_builder_t7compileER11hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'hb_ot_map_t&' -->
-          <parameter type-id='type-id-1911'/>
+          <parameter type-id='type-id-1909'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30115,11 +30102,11 @@
         <!-- hb_ot_map_builder_t::hb_ot_map_builder_t(hb_face_t*, const hb_segment_properties_t*) -->
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'const hb_segment_properties_t*' -->
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-173'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30128,7 +30115,7 @@
         <!-- void hb_ot_map_builder_t::finish() -->
         <function-decl name='finish' mangled-name='_ZN19hb_ot_map_builder_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30137,9 +30124,9 @@
         <!-- void hb_ot_map_builder_t::add_global_bool_feature(hb_tag_t) -->
         <function-decl name='add_global_bool_feature' mangled-name='_ZN19hb_ot_map_builder_t23add_global_bool_featureEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30148,11 +30135,11 @@
         <!-- hb_ot_map_builder_t::hb_ot_map_builder_t(hb_face_t*, const hb_segment_properties_t*) -->
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'const hb_segment_properties_t*' -->
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-173'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30161,11 +30148,11 @@
         <!-- hb_ot_map_builder_t::hb_ot_map_builder_t(hb_face_t*, const hb_segment_properties_t*) -->
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'const hb_segment_properties_t*' -->
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-173'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30174,11 +30161,11 @@
         <!-- hb_ot_map_builder_t::hb_ot_map_builder_t(hb_face_t*, const hb_segment_properties_t*) -->
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'const hb_segment_properties_t*' -->
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-173'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30187,11 +30174,11 @@
         <!-- hb_ot_map_builder_t::hb_ot_map_builder_t(hb_face_t*, const hb_segment_properties_t*) -->
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'const hb_segment_properties_t*' -->
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-173'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30200,29 +30187,29 @@
         <!-- hb_ot_map_builder_t::hb_ot_map_builder_t(hb_face_t*, const hb_segment_properties_t*) -->
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- parameter of type 'const hb_segment_properties_t*' -->
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-173'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_ot_shape_plan_t -->
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1791'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1795'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_segment_properties_t hb_ot_shape_plan_t::props -->
         <var-decl name='props' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const hb_ot_complex_shaper_t* hb_ot_shape_plan_t::shaper -->
-        <var-decl name='shaper' type-id='type-id-1816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
+        <var-decl name='shaper' type-id='type-id-1814' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- hb_ot_map_t hb_ot_shape_plan_t::map -->
-        <var-decl name='map' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='41' column='1'/>
+        <var-decl name='map' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
         <!-- void* hb_ot_shape_plan_t::data -->
@@ -30264,11 +30251,11 @@
         <!-- void hb_ot_shape_plan_t::collect_lookups(hb_tag_t, hb_set_t*) -->
         <function-decl name='collect_lookups' mangled-name='_ZNK18hb_ot_shape_plan_t15collect_lookupsEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-960'/>
+          <parameter type-id='type-id-958'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30277,7 +30264,7 @@
         <!-- void hb_ot_shape_plan_t::substitute(hb_font_t*, hb_buffer_t*) -->
         <function-decl name='substitute' mangled-name='_ZNK18hb_ot_shape_plan_t10substituteEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_buffer_t*' -->
@@ -30290,7 +30277,7 @@
         <!-- void hb_ot_shape_plan_t::position(hb_font_t*, hb_buffer_t*) -->
         <function-decl name='position' mangled-name='_ZNK18hb_ot_shape_plan_t8positionEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_buffer_t*' -->
@@ -30303,14 +30290,14 @@
         <!-- void hb_ot_shape_plan_t::finish() -->
         <function-decl name='finish' mangled-name='_ZN18hb_ot_shape_plan_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_shape_plan_t*' -->
-          <parameter type-id='type-id-1817' is-artificial='yes'/>
+          <parameter type-id='type-id-1815' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u> -->
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_builder_t::feature_info_t, 32u&gt;' size-in-bits='7296' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-1909'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_builder_t::feature_info_t, 32u&gt;' size-in-bits='7296' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-1907'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>::len -->
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
@@ -30321,26 +30308,26 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_ot_map_builder_t::feature_info_t* hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>::array -->
-        <var-decl name='array' type-id='type-id-1912' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-1910' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_ot_map_builder_t::feature_info_t hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>::static_array[32] -->
-        <var-decl name='static_array' type-id='type-id-1901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-1899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- hb_ot_map_builder_t::feature_info_t* hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>::push() -->
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>*' -->
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <!-- hb_ot_map_builder_t::feature_info_t* -->
-          <return type-id='type-id-1912'/>
+          <return type-id='type-id-1910'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>::qsort() -->
         <function-decl name='qsort' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EE5qsortEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>*' -->
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -30349,18 +30336,18 @@
         <!-- hb_ot_map_builder_t::feature_info_t& hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>::operator[](unsigned int) -->
         <function-decl name='operator[]' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>*' -->
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- hb_ot_map_builder_t::feature_info_t& -->
-          <return type-id='type-id-1914'/>
+          <return type-id='type-id-1912'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>::shrink(unsigned int) -->
         <function-decl name='shrink' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EE6shrinkEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>*' -->
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- void -->
@@ -30371,14 +30358,14 @@
         <!-- void hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>::finish() -->
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>*' -->
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u> -->
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_builder_t::stage_info_t, 8u&gt;' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-1904'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_builder_t::stage_info_t, 8u&gt;' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-1902'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>::len -->
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
@@ -30389,245 +30376,245 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_ot_map_builder_t::stage_info_t* hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>::array -->
-        <var-decl name='array' type-id='type-id-1915' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-1913' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_ot_map_builder_t::stage_info_t hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>::static_array[8] -->
-        <var-decl name='static_array' type-id='type-id-1903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-1901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- hb_ot_map_builder_t::stage_info_t* hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>::push() -->
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t12stage_info_tELj8EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>*' -->
-          <parameter type-id='type-id-1916' is-artificial='yes'/>
+          <parameter type-id='type-id-1914' is-artificial='yes'/>
           <!-- hb_ot_map_builder_t::stage_info_t* -->
-          <return type-id='type-id-1915'/>
+          <return type-id='type-id-1913'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_ot_map_builder_t::stage_info_t& hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>::operator[](unsigned int) -->
         <function-decl name='operator[]' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t12stage_info_tELj8EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>*' -->
-          <parameter type-id='type-id-1916' is-artificial='yes'/>
+          <parameter type-id='type-id-1914' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- hb_ot_map_builder_t::stage_info_t& -->
-          <return type-id='type-id-1917'/>
+          <return type-id='type-id-1915'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>::finish() -->
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t12stage_info_tELj8EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>*' -->
-          <parameter type-id='type-id-1916' is-artificial='yes'/>
+          <parameter type-id='type-id-1914' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- const hb_ot_map_builder_t::feature_info_t -->
-    <qualified-type-def type-id='type-id-1900' const='yes' id='type-id-1918'/>
+    <qualified-type-def type-id='type-id-1898' const='yes' id='type-id-1916'/>
     <!-- const hb_ot_map_builder_t::feature_info_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1918' size-in-bits='64' id='type-id-1919'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1916' size-in-bits='64' id='type-id-1917'/>
     <!-- const hb_ot_map_builder_t::feature_info_t* -->
-    <pointer-type-def type-id='type-id-1918' size-in-bits='64' id='type-id-1908'/>
+    <pointer-type-def type-id='type-id-1916' size-in-bits='64' id='type-id-1906'/>
     <!-- const hb_ot_map_builder_t::stage_info_t -->
-    <qualified-type-def type-id='type-id-1902' const='yes' id='type-id-1920'/>
+    <qualified-type-def type-id='type-id-1900' const='yes' id='type-id-1918'/>
     <!-- const hb_ot_map_builder_t::stage_info_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1920' size-in-bits='64' id='type-id-1921'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1918' size-in-bits='64' id='type-id-1919'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u> -->
-    <qualified-type-def type-id='type-id-1909' const='yes' id='type-id-1922'/>
+    <qualified-type-def type-id='type-id-1907' const='yes' id='type-id-1920'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>* -->
-    <pointer-type-def type-id='type-id-1922' size-in-bits='64' id='type-id-1923'/>
+    <pointer-type-def type-id='type-id-1920' size-in-bits='64' id='type-id-1921'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u> -->
-    <qualified-type-def type-id='type-id-1904' const='yes' id='type-id-1924'/>
+    <qualified-type-def type-id='type-id-1902' const='yes' id='type-id-1922'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>* -->
-    <pointer-type-def type-id='type-id-1924' size-in-bits='64' id='type-id-1925'/>
+    <pointer-type-def type-id='type-id-1922' size-in-bits='64' id='type-id-1923'/>
     <!-- hb_ot_map_builder_t* -->
-    <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1910'/>
+    <pointer-type-def type-id='type-id-1905' size-in-bits='64' id='type-id-1908'/>
     <!-- hb_ot_map_builder_t::feature_info_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1900' size-in-bits='64' id='type-id-1914'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1898' size-in-bits='64' id='type-id-1912'/>
     <!-- hb_ot_map_builder_t::feature_info_t* -->
-    <pointer-type-def type-id='type-id-1900' size-in-bits='64' id='type-id-1912'/>
+    <pointer-type-def type-id='type-id-1898' size-in-bits='64' id='type-id-1910'/>
     <!-- hb_ot_map_builder_t::stage_info_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1902' size-in-bits='64' id='type-id-1917'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1900' size-in-bits='64' id='type-id-1915'/>
     <!-- hb_ot_map_builder_t::stage_info_t* -->
-    <pointer-type-def type-id='type-id-1902' size-in-bits='64' id='type-id-1915'/>
+    <pointer-type-def type-id='type-id-1900' size-in-bits='64' id='type-id-1913'/>
     <!-- hb_ot_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-949' size-in-bits='64' id='type-id-1911'/>
+    <reference-type-def kind='lvalue' type-id='type-id-947' size-in-bits='64' id='type-id-1909'/>
     <!-- hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u>* -->
-    <pointer-type-def type-id='type-id-1909' size-in-bits='64' id='type-id-1913'/>
+    <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1911'/>
     <!-- hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>* -->
-    <pointer-type-def type-id='type-id-1904' size-in-bits='64' id='type-id-1916'/>
+    <pointer-type-def type-id='type-id-1902' size-in-bits='64' id='type-id-1914'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-546'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1022' size-in-bits='64' id='type-id-544'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-567'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1039' size-in-bits='64' id='type-id-565'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1042' size-in-bits='64' id='type-id-565'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-563'/>
     <!-- OT::CoverageFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-551'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1123' size-in-bits='64' id='type-id-549'/>
     <!-- OT::CoverageFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1128' size-in-bits='64' id='type-id-555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-553'/>
     <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-569'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1164' size-in-bits='64' id='type-id-567'/>
     <!-- OT::LigatureSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1182' size-in-bits='64' id='type-id-572'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1180' size-in-bits='64' id='type-id-570'/>
     <!-- OT::SingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1314' size-in-bits='64' id='type-id-558'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1312' size-in-bits='64' id='type-id-556'/>
     <!-- OT::SingleSubstFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1315' size-in-bits='64' id='type-id-562'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1313' size-in-bits='64' id='type-id-560'/>
     <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1744' size-in-bits='64' id='type-id-552'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1744' size-in-bits='64' id='type-id-550'/>
     <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-550'/>
+    <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-548'/>
     <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1747' size-in-bits='64' id='type-id-556'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1747' size-in-bits='64' id='type-id-554'/>
     <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1747' size-in-bits='64' id='type-id-554'/>
+    <pointer-type-def type-id='type-id-1747' size-in-bits='64' id='type-id-552'/>
     <!-- OT::SubstLookup* const -->
-    <qualified-type-def type-id='type-id-543' const='yes' id='type-id-1926'/>
+    <qualified-type-def type-id='type-id-541' const='yes' id='type-id-1924'/>
     <!-- OT::SubstLookup* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1926' size-in-bits='64' id='type-id-935'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1924' size-in-bits='64' id='type-id-933'/>
     <!-- OT::Supplier<OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-850'/>
+    <pointer-type-def type-id='type-id-748' size-in-bits='64' id='type-id-848'/>
     <!-- OT::Supplier<unsigned int>* -->
-    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-1897'/>
+    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-1895'/>
     <!-- OT::USHORT& -->
-    <reference-type-def kind='lvalue' type-id='type-id-373' size-in-bits='64' id='type-id-573'/>
+    <reference-type-def kind='lvalue' type-id='type-id-371' size-in-bits='64' id='type-id-571'/>
     <!-- const OT::Supplier<OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-750' const='yes' id='type-id-1927'/>
+    <qualified-type-def type-id='type-id-748' const='yes' id='type-id-1925'/>
     <!-- const OT::Supplier<OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1927' size-in-bits='64' id='type-id-851'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1925' size-in-bits='64' id='type-id-849'/>
     <!-- const OT::Supplier<OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1927' size-in-bits='64' id='type-id-852'/>
+    <pointer-type-def type-id='type-id-1925' size-in-bits='64' id='type-id-850'/>
     <!-- const OT::Supplier<unsigned int> -->
-    <qualified-type-def type-id='type-id-1377' const='yes' id='type-id-1928'/>
+    <qualified-type-def type-id='type-id-1375' const='yes' id='type-id-1926'/>
     <!-- const OT::Supplier<unsigned int>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1928' size-in-bits='64' id='type-id-1898'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1926' size-in-bits='64' id='type-id-1896'/>
     <!-- const OT::Supplier<unsigned int>* -->
-    <pointer-type-def type-id='type-id-1928' size-in-bits='64' id='type-id-1899'/>
+    <pointer-type-def type-id='type-id-1926' size-in-bits='64' id='type-id-1897'/>
     <!-- const unsigned int* -->
-    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-1896'/>
+    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-1894'/>
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::AlternateSubst -->
-      <class-decl name='AlternateSubst' is-struct='yes' visibility='default' id='type-id-1929'/>
+      <class-decl name='AlternateSubst' is-struct='yes' visibility='default' id='type-id-1927'/>
       <!-- struct OT::AlternateSubstFormat1 -->
-      <class-decl name='AlternateSubstFormat1' is-struct='yes' visibility='default' id='type-id-1930'/>
+      <class-decl name='AlternateSubstFormat1' is-struct='yes' visibility='default' id='type-id-1928'/>
       <!-- struct OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1931'/>
+      <class-decl name='ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1929'/>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1932'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1930'/>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1933'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1931'/>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1934'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1932'/>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1935'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1933'/>
       <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1936'/>
+      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1934'/>
       <!-- struct OT::ChainContext -->
-      <class-decl name='ChainContext' is-struct='yes' visibility='default' id='type-id-1937'/>
+      <class-decl name='ChainContext' is-struct='yes' visibility='default' id='type-id-1935'/>
       <!-- struct OT::ChainContextFormat1 -->
-      <class-decl name='ChainContextFormat1' is-struct='yes' visibility='default' id='type-id-1938'/>
+      <class-decl name='ChainContextFormat1' is-struct='yes' visibility='default' id='type-id-1936'/>
       <!-- struct OT::ChainContextFormat2 -->
-      <class-decl name='ChainContextFormat2' is-struct='yes' visibility='default' id='type-id-1939'/>
+      <class-decl name='ChainContextFormat2' is-struct='yes' visibility='default' id='type-id-1937'/>
       <!-- struct OT::ChainContextFormat3 -->
-      <class-decl name='ChainContextFormat3' is-struct='yes' visibility='default' id='type-id-1940'/>
+      <class-decl name='ChainContextFormat3' is-struct='yes' visibility='default' id='type-id-1938'/>
       <!-- struct OT::Context -->
-      <class-decl name='Context' is-struct='yes' visibility='default' id='type-id-1941'/>
+      <class-decl name='Context' is-struct='yes' visibility='default' id='type-id-1939'/>
       <!-- struct OT::ContextFormat1 -->
-      <class-decl name='ContextFormat1' is-struct='yes' visibility='default' id='type-id-1942'/>
+      <class-decl name='ContextFormat1' is-struct='yes' visibility='default' id='type-id-1940'/>
       <!-- struct OT::ContextFormat2 -->
-      <class-decl name='ContextFormat2' is-struct='yes' visibility='default' id='type-id-1943'/>
+      <class-decl name='ContextFormat2' is-struct='yes' visibility='default' id='type-id-1941'/>
       <!-- struct OT::ContextFormat3 -->
-      <class-decl name='ContextFormat3' is-struct='yes' visibility='default' id='type-id-1944'/>
+      <class-decl name='ContextFormat3' is-struct='yes' visibility='default' id='type-id-1942'/>
       <!-- struct OT::Coverage -->
-      <class-decl name='Coverage' is-struct='yes' visibility='default' id='type-id-1945'/>
+      <class-decl name='Coverage' is-struct='yes' visibility='default' id='type-id-1943'/>
       <!-- struct OT::CoverageFormat1 -->
-      <class-decl name='CoverageFormat1' is-struct='yes' visibility='default' id='type-id-1946'/>
+      <class-decl name='CoverageFormat1' is-struct='yes' visibility='default' id='type-id-1944'/>
       <!-- struct OT::CoverageFormat2 -->
-      <class-decl name='CoverageFormat2' is-struct='yes' visibility='default' id='type-id-1947'/>
+      <class-decl name='CoverageFormat2' is-struct='yes' visibility='default' id='type-id-1945'/>
       <!-- struct OT::Extension<OT::ExtensionSubst> -->
-      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' is-struct='yes' visibility='default' id='type-id-1948'/>
+      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' is-struct='yes' visibility='default' id='type-id-1946'/>
       <!-- struct OT::ExtensionFormat1 -->
-      <class-decl name='ExtensionFormat1' is-struct='yes' visibility='default' id='type-id-1949'/>
+      <class-decl name='ExtensionFormat1' is-struct='yes' visibility='default' id='type-id-1947'/>
       <!-- struct OT::GDEF -->
-      <class-decl name='GDEF' is-struct='yes' visibility='default' id='type-id-1950'/>
+      <class-decl name='GDEF' is-struct='yes' visibility='default' id='type-id-1948'/>
       <!-- struct OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1951'/>
+      <class-decl name='HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1949'/>
       <!-- struct OT::Ligature -->
-      <class-decl name='Ligature' is-struct='yes' visibility='default' id='type-id-1952'/>
+      <class-decl name='Ligature' is-struct='yes' visibility='default' id='type-id-1950'/>
       <!-- struct OT::LigatureSet -->
-      <class-decl name='LigatureSet' is-struct='yes' visibility='default' id='type-id-1953'/>
+      <class-decl name='LigatureSet' is-struct='yes' visibility='default' id='type-id-1951'/>
       <!-- struct OT::LigatureSubst -->
-      <class-decl name='LigatureSubst' is-struct='yes' visibility='default' id='type-id-1954'/>
+      <class-decl name='LigatureSubst' is-struct='yes' visibility='default' id='type-id-1952'/>
       <!-- struct OT::LigatureSubstFormat1 -->
-      <class-decl name='LigatureSubstFormat1' is-struct='yes' visibility='default' id='type-id-1955'/>
+      <class-decl name='LigatureSubstFormat1' is-struct='yes' visibility='default' id='type-id-1953'/>
       <!-- struct OT::Lookup -->
-      <class-decl name='Lookup' is-struct='yes' visibility='default' id='type-id-1956'/>
+      <class-decl name='Lookup' is-struct='yes' visibility='default' id='type-id-1954'/>
       <!-- struct OT::MultipleSubst -->
-      <class-decl name='MultipleSubst' is-struct='yes' visibility='default' id='type-id-1957'/>
+      <class-decl name='MultipleSubst' is-struct='yes' visibility='default' id='type-id-1955'/>
       <!-- struct OT::MultipleSubstFormat1 -->
-      <class-decl name='MultipleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1958'/>
+      <class-decl name='MultipleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1956'/>
       <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1959'/>
+      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1957'/>
       <!-- struct OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1960'/>
+      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1958'/>
       <!-- struct OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1961'/>
+      <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1959'/>
       <!-- struct OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1962'/>
+      <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1960'/>
       <!-- struct OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1963'/>
+      <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1961'/>
       <!-- struct OT::RangeRecord -->
-      <class-decl name='RangeRecord' is-struct='yes' visibility='default' id='type-id-1964'/>
+      <class-decl name='RangeRecord' is-struct='yes' visibility='default' id='type-id-1962'/>
       <!-- struct OT::ReverseChainSingleSubst -->
-      <class-decl name='ReverseChainSingleSubst' is-struct='yes' visibility='default' id='type-id-1965'/>
+      <class-decl name='ReverseChainSingleSubst' is-struct='yes' visibility='default' id='type-id-1963'/>
       <!-- struct OT::ReverseChainSingleSubstFormat1 -->
-      <class-decl name='ReverseChainSingleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1966'/>
+      <class-decl name='ReverseChainSingleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1964'/>
       <!-- struct OT::SingleSubst -->
-      <class-decl name='SingleSubst' is-struct='yes' visibility='default' id='type-id-1967'/>
+      <class-decl name='SingleSubst' is-struct='yes' visibility='default' id='type-id-1965'/>
       <!-- struct OT::SingleSubstFormat1 -->
-      <class-decl name='SingleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1968'/>
+      <class-decl name='SingleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1966'/>
       <!-- struct OT::SingleSubstFormat2 -->
-      <class-decl name='SingleSubstFormat2' is-struct='yes' visibility='default' id='type-id-1969'/>
+      <class-decl name='SingleSubstFormat2' is-struct='yes' visibility='default' id='type-id-1967'/>
       <!-- struct OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1970'/>
+      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1968'/>
       <!-- struct OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1971'/>
+      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1969'/>
       <!-- struct OT::SubstLookup -->
-      <class-decl name='SubstLookup' is-struct='yes' visibility='default' id='type-id-1972'/>
+      <class-decl name='SubstLookup' is-struct='yes' visibility='default' id='type-id-1970'/>
       <!-- struct OT::SubstLookupSubTable -->
-      <class-decl name='SubstLookupSubTable' is-struct='yes' visibility='default' id='type-id-1973'/>
+      <class-decl name='SubstLookupSubTable' is-struct='yes' visibility='default' id='type-id-1971'/>
       <!-- struct OT::hb_closure_context_t -->
-      <class-decl name='hb_closure_context_t' is-struct='yes' visibility='default' id='type-id-1974'/>
+      <class-decl name='hb_closure_context_t' is-struct='yes' visibility='default' id='type-id-1972'/>
       <!-- struct OT::hb_collect_glyphs_context_t -->
-      <class-decl name='hb_collect_glyphs_context_t' is-struct='yes' visibility='default' id='type-id-1975'/>
+      <class-decl name='hb_collect_glyphs_context_t' is-struct='yes' visibility='default' id='type-id-1973'/>
       <!-- struct OT::hb_get_coverage_context_t -->
-      <class-decl name='hb_get_coverage_context_t' is-struct='yes' visibility='default' id='type-id-1976'/>
+      <class-decl name='hb_get_coverage_context_t' is-struct='yes' visibility='default' id='type-id-1974'/>
       <!-- struct OT::hb_would_apply_context_t -->
-      <class-decl name='hb_would_apply_context_t' is-struct='yes' visibility='default' id='type-id-1977'/>
+      <class-decl name='hb_would_apply_context_t' is-struct='yes' visibility='default' id='type-id-1975'/>
       <!-- struct OT::Supplier<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='Supplier&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-750'>
+      <class-decl name='Supplier&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-748'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- unsigned int OT::Supplier<OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='511' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- const OT::IntType<short unsigned int, 2u>* OT::Supplier<OT::IntType<short unsigned int, 2u> >::head -->
-          <var-decl name='head' type-id='type-id-295' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
+          <var-decl name='head' type-id='type-id-293' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::Supplier<OT::IntType<short unsigned int, 2u> >::Supplier(const OT::IntType<short unsigned int, 2u>*, unsigned int) -->
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-850' is-artificial='yes'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
             <!-- parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-293'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -30638,9 +30625,9 @@
           <!-- void OT::Supplier<OT::IntType<short unsigned int, 2u> >::Supplier(const OT::Supplier<OT::IntType<short unsigned int, 2u> >&) -->
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-850' is-artificial='yes'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
-            <parameter type-id='type-id-851'/>
+            <parameter type-id='type-id-849'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -30649,18 +30636,18 @@
           <!-- const OT::IntType<short unsigned int, 2u> OT::Supplier<OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierINS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Supplier<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-852' is-artificial='yes'/>
+            <parameter type-id='type-id-850' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const OT::IntType<short unsigned int, 2u> -->
-            <return type-id='type-id-293'/>
+            <return type-id='type-id-291'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void OT::Supplier<OT::IntType<short unsigned int, 2u> >::advance(unsigned int) -->
           <function-decl name='advance' mangled-name='_ZN2OT8SupplierINS_7IntTypeItLj2EEEE7advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-850' is-artificial='yes'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -30669,22 +30656,22 @@
         </member-function>
       </class-decl>
       <!-- struct OT::Supplier<unsigned int> -->
-      <class-decl name='Supplier&lt;unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-1377'>
+      <class-decl name='Supplier&lt;unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-1375'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- unsigned int OT::Supplier<unsigned int>::len -->
           <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='511' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- const unsigned int* OT::Supplier<unsigned int>::head -->
-          <var-decl name='head' type-id='type-id-1896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
+          <var-decl name='head' type-id='type-id-1894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::Supplier<unsigned int>::Supplier(const unsigned int*, unsigned int) -->
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<unsigned int>*' -->
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned int*' -->
-            <parameter type-id='type-id-1896'/>
+            <parameter type-id='type-id-1894'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -30695,9 +30682,9 @@
           <!-- void OT::Supplier<unsigned int>::Supplier(const OT::Supplier<unsigned int>&) -->
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<unsigned int>*' -->
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Supplier<unsigned int>&' -->
-            <parameter type-id='type-id-1898'/>
+            <parameter type-id='type-id-1896'/>
             <!-- void -->
             <return type-id='type-id-23'/>
           </function-decl>
@@ -30706,7 +30693,7 @@
           <!-- const unsigned int OT::Supplier<unsigned int>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierIjEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Supplier<unsigned int>*' -->
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- const unsigned int -->
@@ -30717,7 +30704,7 @@
           <!-- void OT::Supplier<unsigned int>::advance(unsigned int) -->
           <function-decl name='advance' mangled-name='_ZN2OT8SupplierIjE7advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::Supplier<unsigned int>*' -->
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -30737,19 +30724,19 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- hb_mask_t[21] -->
-    <array-type-def dimensions='1' type-id='type-id-92' size-in-bits='672' id='type-id-1978'>
+    <array-type-def dimensions='1' type-id='type-id-92' size-in-bits='672' id='type-id-1976'>
       <!-- <anonymous range>[21] -->
-      <subrange length='21' type-id='type-id-4' id='type-id-1979'/>
+      <subrange length='21' type-id='type-id-4' id='type-id-1977'/>
     </array-type-def>
     <!-- enum base_position_t -->
-    <enum-decl name='base_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='276' column='1' id='type-id-1980'>
+    <enum-decl name='base_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='276' column='1' id='type-id-1978'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='BASE_POS_FIRST' value='0'/>
       <enumerator name='BASE_POS_LAST_SINHALA' value='1'/>
       <enumerator name='BASE_POS_LAST' value='2'/>
     </enum-decl>
     <!-- enum reph_position_t -->
-    <enum-decl name='reph_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='281' column='1' id='type-id-1981'>
+    <enum-decl name='reph_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='281' column='1' id='type-id-1979'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='REPH_POS_AFTER_MAIN' value='5'/>
       <enumerator name='REPH_POS_BEFORE_SUB' value='7'/>
@@ -30759,7 +30746,7 @@
       <enumerator name='REPH_POS_DONT_CARE' value='1'/>
     </enum-decl>
     <!-- enum reph_mode_t -->
-    <enum-decl name='reph_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='289' column='1' id='type-id-1982'>
+    <enum-decl name='reph_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='289' column='1' id='type-id-1980'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='REPH_MODE_IMPLICIT' value='0'/>
       <enumerator name='REPH_MODE_EXPLICIT' value='1'/>
@@ -30767,20 +30754,20 @@
       <enumerator name='REPH_MODE_LOG_REPHA' value='3'/>
     </enum-decl>
     <!-- enum blwf_mode_t -->
-    <enum-decl name='blwf_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='295' column='1' id='type-id-1983'>
+    <enum-decl name='blwf_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='295' column='1' id='type-id-1981'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='BLWF_MODE_PRE_AND_POST' value='0'/>
       <enumerator name='BLWF_MODE_POST_ONLY' value='1'/>
     </enum-decl>
     <!-- enum pref_len_t -->
-    <enum-decl name='pref_len_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='299' column='1' id='type-id-1984'>
+    <enum-decl name='pref_len_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='299' column='1' id='type-id-1982'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='PREF_LEN_1' value='1'/>
       <enumerator name='PREF_LEN_2' value='2'/>
       <enumerator name='PREF_LEN_DONT_CARE' value='2'/>
     </enum-decl>
     <!-- struct indic_config_t -->
-    <class-decl name='indic_config_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='305' column='1' id='type-id-1985'>
+    <class-decl name='indic_config_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='305' column='1' id='type-id-1983'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_script_t indic_config_t::script -->
         <var-decl name='script' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='306' column='1'/>
@@ -30795,30 +30782,30 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- base_position_t indic_config_t::base_pos -->
-        <var-decl name='base_pos' type-id='type-id-1980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='309' column='1'/>
+        <var-decl name='base_pos' type-id='type-id-1978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- reph_position_t indic_config_t::reph_pos -->
-        <var-decl name='reph_pos' type-id='type-id-1981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='310' column='1'/>
+        <var-decl name='reph_pos' type-id='type-id-1979' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='310' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- reph_mode_t indic_config_t::reph_mode -->
-        <var-decl name='reph_mode' type-id='type-id-1982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='311' column='1'/>
+        <var-decl name='reph_mode' type-id='type-id-1980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- blwf_mode_t indic_config_t::blwf_mode -->
-        <var-decl name='blwf_mode' type-id='type-id-1983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='312' column='1'/>
+        <var-decl name='blwf_mode' type-id='type-id-1981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='312' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- pref_len_t indic_config_t::pref_len -->
-        <var-decl name='pref_len' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='313' column='1'/>
+        <var-decl name='pref_len' type-id='type-id-1982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='313' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct would_substitute_feature_t -->
-    <class-decl name='would_substitute_feature_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='481' column='1' id='type-id-1986'>
+    <class-decl name='would_substitute_feature_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='481' column='1' id='type-id-1984'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- const hb_ot_map_t::lookup_map_t* would_substitute_feature_t::lookups -->
-        <var-decl name='lookups' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='501' column='1'/>
+        <var-decl name='lookups' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='501' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- unsigned int would_substitute_feature_t::count -->
@@ -30832,13 +30819,13 @@
         <!-- bool would_substitute_feature_t::would_substitute(const hb_codepoint_t*, unsigned int, hb_face_t*) -->
         <function-decl name='would_substitute' mangled-name='_ZNK26would_substitute_feature_t16would_substituteEPKjjP9hb_face_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const would_substitute_feature_t*' -->
-          <parameter type-id='type-id-1987' is-artificial='yes'/>
+          <parameter type-id='type-id-1985' is-artificial='yes'/>
           <!-- parameter of type 'const hb_codepoint_t*' -->
           <parameter type-id='type-id-95'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-12'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <!-- bool -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -30847,11 +30834,11 @@
         <!-- void would_substitute_feature_t::init(const hb_ot_map_t*, hb_tag_t, bool) -->
         <function-decl name='init' mangled-name='_ZN26would_substitute_feature_t4initEPK11hb_ot_map_tjb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'would_substitute_feature_t*' -->
-          <parameter type-id='type-id-1988' is-artificial='yes'/>
+          <parameter type-id='type-id-1986' is-artificial='yes'/>
           <!-- parameter of type 'const hb_ot_map_t*' -->
-          <parameter type-id='type-id-956'/>
+          <parameter type-id='type-id-954'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <!-- parameter of type 'bool' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
@@ -30860,10 +30847,10 @@
       </member-function>
     </class-decl>
     <!-- struct indic_shape_plan_t -->
-    <class-decl name='indic_shape_plan_t' size-in-bits='1344' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='507' column='1' id='type-id-1989'>
+    <class-decl name='indic_shape_plan_t' size-in-bits='1344' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='507' column='1' id='type-id-1987'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const indic_config_t* indic_shape_plan_t::config -->
-        <var-decl name='config' type-id='type-id-1990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='529' column='1'/>
+        <var-decl name='config' type-id='type-id-1988' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- bool indic_shape_plan_t::is_old_spec -->
@@ -30875,29 +30862,29 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- would_substitute_feature_t indic_shape_plan_t::rphf -->
-        <var-decl name='rphf' type-id='type-id-1986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='534' column='1'/>
+        <var-decl name='rphf' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- would_substitute_feature_t indic_shape_plan_t::pref -->
-        <var-decl name='pref' type-id='type-id-1986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='535' column='1'/>
+        <var-decl name='pref' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='535' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- would_substitute_feature_t indic_shape_plan_t::blwf -->
-        <var-decl name='blwf' type-id='type-id-1986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='536' column='1'/>
+        <var-decl name='blwf' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- would_substitute_feature_t indic_shape_plan_t::pstf -->
-        <var-decl name='pstf' type-id='type-id-1986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='537' column='1'/>
+        <var-decl name='pstf' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- hb_mask_t indic_shape_plan_t::mask_array[21] -->
-        <var-decl name='mask_array' type-id='type-id-1978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='539' column='1'/>
+        <var-decl name='mask_array' type-id='type-id-1976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='539' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- bool indic_shape_plan_t::get_virama_glyph(hb_font_t*, hb_codepoint_t*) -->
         <function-decl name='get_virama_glyph' mangled-name='_ZNK18indic_shape_plan_t16get_virama_glyphEP9hb_font_tPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='510' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const indic_shape_plan_t*' -->
-          <parameter type-id='type-id-1991' is-artificial='yes'/>
+          <parameter type-id='type-id-1989' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
           <parameter type-id='type-id-147'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
@@ -30908,19 +30895,19 @@
       </member-function>
     </class-decl>
     <!-- const indic_config_t -->
-    <qualified-type-def type-id='type-id-1985' const='yes' id='type-id-1992'/>
+    <qualified-type-def type-id='type-id-1983' const='yes' id='type-id-1990'/>
     <!-- const indic_config_t* -->
-    <pointer-type-def type-id='type-id-1992' size-in-bits='64' id='type-id-1990'/>
+    <pointer-type-def type-id='type-id-1990' size-in-bits='64' id='type-id-1988'/>
     <!-- const indic_shape_plan_t -->
-    <qualified-type-def type-id='type-id-1989' const='yes' id='type-id-1993'/>
+    <qualified-type-def type-id='type-id-1987' const='yes' id='type-id-1991'/>
     <!-- const indic_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-1993' size-in-bits='64' id='type-id-1991'/>
+    <pointer-type-def type-id='type-id-1991' size-in-bits='64' id='type-id-1989'/>
     <!-- const would_substitute_feature_t -->
-    <qualified-type-def type-id='type-id-1986' const='yes' id='type-id-1994'/>
+    <qualified-type-def type-id='type-id-1984' const='yes' id='type-id-1992'/>
     <!-- const would_substitute_feature_t* -->
-    <pointer-type-def type-id='type-id-1994' size-in-bits='64' id='type-id-1987'/>
+    <pointer-type-def type-id='type-id-1992' size-in-bits='64' id='type-id-1985'/>
     <!-- would_substitute_feature_t* -->
-    <pointer-type-def type-id='type-id-1986' size-in-bits='64' id='type-id-1988'/>
+    <pointer-type-def type-id='type-id-1984' size-in-bits='64' id='type-id-1986'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
   </abi-instr>
@@ -30934,29 +30921,29 @@
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1995'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1993'/>
       <!-- struct OT::MarkGlyphSets -->
-      <class-decl name='MarkGlyphSets' is-struct='yes' visibility='default' id='type-id-1996'/>
+      <class-decl name='MarkGlyphSets' is-struct='yes' visibility='default' id='type-id-1994'/>
       <!-- struct OT::MarkGlyphSetsFormat1 -->
-      <class-decl name='MarkGlyphSetsFormat1' is-struct='yes' visibility='default' id='type-id-1997'/>
+      <class-decl name='MarkGlyphSetsFormat1' is-struct='yes' visibility='default' id='type-id-1995'/>
       <!-- struct OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1998'/>
+      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1996'/>
       <!-- struct OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1999'/>
+      <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1997'/>
       <!-- struct OT::Coverage -->
-      <class-decl name='Coverage' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2000'/>
+      <class-decl name='Coverage' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1998'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- char[8] -->
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-2001'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-1999'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
     <!-- enum hb_ot_shape_zero_width_marks_type_t -->
-    <enum-decl name='hb_ot_shape_zero_width_marks_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='42' column='1' id='type-id-2002'>
+    <enum-decl name='hb_ot_shape_zero_width_marks_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='42' column='1' id='type-id-2000'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE' value='0'/>
       <enumerator name='HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE' value='1'/>
@@ -30965,22 +30952,22 @@
       <enumerator name='HB_OT_SHAPE_ZERO_WIDTH_MARKS_DEFAULT' value='1'/>
     </enum-decl>
     <!-- struct hb_ot_complex_shaper_t -->
-    <class-decl name='hb_ot_complex_shaper_t' size-in-bits='704' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='69' column='1' id='type-id-2003'>
+    <class-decl name='hb_ot_complex_shaper_t' size-in-bits='704' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='69' column='1' id='type-id-2001'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char hb_ot_complex_shaper_t::name[8] -->
-        <var-decl name='name' type-id='type-id-2001' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='70' column='1'/>
+        <var-decl name='name' type-id='type-id-1999' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void (hb_ot_shape_planner_t*)* hb_ot_complex_shaper_t::collect_features -->
-        <var-decl name='collect_features' type-id='type-id-2004' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='77' column='1'/>
+        <var-decl name='collect_features' type-id='type-id-2002' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (hb_ot_shape_planner_t*)* hb_ot_complex_shaper_t::override_features -->
-        <var-decl name='override_features' type-id='type-id-2004' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='85' column='1'/>
+        <var-decl name='override_features' type-id='type-id-2002' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* (const hb_ot_shape_plan_t*)* hb_ot_complex_shaper_t::data_create -->
-        <var-decl name='data_create' type-id='type-id-2005' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='93' column='1'/>
+        <var-decl name='data_create' type-id='type-id-2003' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- void (void*)* hb_ot_complex_shaper_t::data_destroy -->
@@ -30988,27 +30975,27 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* hb_ot_complex_shaper_t::preprocess_text -->
-        <var-decl name='preprocess_text' type-id='type-id-2006' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='111' column='1'/>
+        <var-decl name='preprocess_text' type-id='type-id-2004' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- hb_ot_shape_normalization_mode_t hb_ot_complex_shaper_t::normalization_preference -->
-        <var-decl name='normalization_preference' type-id='type-id-2007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='114' column='1'/>
+        <var-decl name='normalization_preference' type-id='type-id-2005' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* hb_ot_complex_shaper_t::decompose -->
-        <var-decl name='decompose' type-id='type-id-2008' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='123' column='1'/>
+        <var-decl name='decompose' type-id='type-id-2006' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* hb_ot_complex_shaper_t::compose -->
-        <var-decl name='compose' type-id='type-id-2009' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='132' column='1'/>
+        <var-decl name='compose' type-id='type-id-2007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* hb_ot_complex_shaper_t::setup_masks -->
-        <var-decl name='setup_masks' type-id='type-id-2006' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='142' column='1'/>
+        <var-decl name='setup_masks' type-id='type-id-2004' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- hb_ot_shape_zero_width_marks_type_t hb_ot_complex_shaper_t::zero_width_marks -->
-        <var-decl name='zero_width_marks' type-id='type-id-2002' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='144' column='1'/>
+        <var-decl name='zero_width_marks' type-id='type-id-2000' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
         <!-- bool hb_ot_complex_shaper_t::fallback_position -->
@@ -31016,7 +31003,7 @@
       </data-member>
     </class-decl>
     <!-- enum hb_ot_shape_normalization_mode_t -->
-    <enum-decl name='hb_ot_shape_normalization_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='38' column='1' id='type-id-2007'>
+    <enum-decl name='hb_ot_shape_normalization_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='38' column='1' id='type-id-2005'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='HB_OT_SHAPE_NORMALIZATION_MODE_NONE' value='0'/>
       <enumerator name='HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED' value='1'/>
@@ -31025,10 +31012,10 @@
       <enumerator name='HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT' value='2'/>
     </enum-decl>
     <!-- struct hb_ot_shape_normalize_context_t -->
-    <class-decl name='hb_ot_shape_normalize_context_t' size-in-bits='384' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='53' column='1' id='type-id-2010'>
+    <class-decl name='hb_ot_shape_normalize_context_t' size-in-bits='384' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='53' column='1' id='type-id-2008'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const hb_ot_shape_plan_t* hb_ot_shape_normalize_context_t::plan -->
-        <var-decl name='plan' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='54' column='1'/>
+        <var-decl name='plan' type-id='type-id-956' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_buffer_t* hb_ot_shape_normalize_context_t::buffer -->
@@ -31044,18 +31031,18 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* hb_ot_shape_normalize_context_t::decompose -->
-        <var-decl name='decompose' type-id='type-id-2008' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
+        <var-decl name='decompose' type-id='type-id-2006' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* hb_ot_shape_normalize_context_t::compose -->
-        <var-decl name='compose' type-id='type-id-2009' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
+        <var-decl name='compose' type-id='type-id-2007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct hb_ot_shape_planner_t -->
-    <class-decl name='hb_ot_shape_planner_t' size-in-bits='10624' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='66' column='1' id='type-id-2011'>
+    <class-decl name='hb_ot_shape_planner_t' size-in-bits='10624' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='66' column='1' id='type-id-2009'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_face_t* hb_ot_shape_planner_t::face -->
-        <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='68' column='1'/>
+        <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_segment_properties_t hb_ot_shape_planner_t::props -->
@@ -31063,19 +31050,19 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- const hb_ot_complex_shaper_t* hb_ot_shape_planner_t::shaper -->
-        <var-decl name='shaper' type-id='type-id-1816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='70' column='1'/>
+        <var-decl name='shaper' type-id='type-id-1814' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- hb_ot_map_builder_t hb_ot_shape_planner_t::map -->
-        <var-decl name='map' type-id='type-id-1907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='71' column='1'/>
+        <var-decl name='map' type-id='type-id-1905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='71' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- hb_ot_shape_planner_t::hb_ot_shape_planner_t(const hb_shape_plan_t*) -->
         <function-decl name='hb_ot_shape_planner_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_shape_planner_t*' -->
-          <parameter type-id='type-id-2012' is-artificial='yes'/>
+          <parameter type-id='type-id-2010' is-artificial='yes'/>
           <!-- parameter of type 'const hb_shape_plan_t*' -->
-          <parameter type-id='type-id-2013'/>
+          <parameter type-id='type-id-2011'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31084,7 +31071,7 @@
         <!-- hb_ot_shape_planner_t::~hb_ot_shape_planner_t(int) -->
         <function-decl name='~hb_ot_shape_planner_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_shape_planner_t*' -->
-          <parameter type-id='type-id-2012' is-artificial='yes'/>
+          <parameter type-id='type-id-2010' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-9' is-artificial='yes'/>
           <!-- void -->
@@ -31095,9 +31082,9 @@
         <!-- hb_ot_shape_planner_t::hb_ot_shape_planner_t(const hb_ot_shape_planner_t&) -->
         <function-decl name='hb_ot_shape_planner_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_shape_planner_t*' -->
-          <parameter type-id='type-id-2012' is-artificial='yes'/>
+          <parameter type-id='type-id-2010' is-artificial='yes'/>
           <!-- parameter of type 'const hb_ot_shape_planner_t&' -->
-          <parameter type-id='type-id-2014'/>
+          <parameter type-id='type-id-2012'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31106,56 +31093,56 @@
         <!-- void hb_ot_shape_planner_t::compile(hb_ot_shape_plan_t&) -->
         <function-decl name='compile' mangled-name='_ZN21hb_ot_shape_planner_t7compileER18hb_ot_shape_plan_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_ot_shape_planner_t*' -->
-          <parameter type-id='type-id-2012' is-artificial='yes'/>
+          <parameter type-id='type-id-2010' is-artificial='yes'/>
           <!-- parameter of type 'hb_ot_shape_plan_t&' -->
-          <parameter type-id='type-id-2015'/>
+          <parameter type-id='type-id-2013'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* -->
-    <pointer-type-def type-id='type-id-2016' size-in-bits='64' id='type-id-2008'/>
+    <pointer-type-def type-id='type-id-2014' size-in-bits='64' id='type-id-2006'/>
     <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* -->
-    <pointer-type-def type-id='type-id-2017' size-in-bits='64' id='type-id-2009'/>
+    <pointer-type-def type-id='type-id-2015' size-in-bits='64' id='type-id-2007'/>
     <!-- const hb_ot_complex_shaper_t -->
-    <qualified-type-def type-id='type-id-2003' const='yes' id='type-id-2018'/>
+    <qualified-type-def type-id='type-id-2001' const='yes' id='type-id-2016'/>
     <!-- const hb_ot_complex_shaper_t* -->
-    <pointer-type-def type-id='type-id-2018' size-in-bits='64' id='type-id-1816'/>
+    <pointer-type-def type-id='type-id-2016' size-in-bits='64' id='type-id-1814'/>
     <!-- const hb_ot_shape_normalize_context_t -->
-    <qualified-type-def type-id='type-id-2010' const='yes' id='type-id-2019'/>
+    <qualified-type-def type-id='type-id-2008' const='yes' id='type-id-2017'/>
     <!-- const hb_ot_shape_normalize_context_t* -->
-    <pointer-type-def type-id='type-id-2019' size-in-bits='64' id='type-id-2020'/>
+    <pointer-type-def type-id='type-id-2017' size-in-bits='64' id='type-id-2018'/>
     <!-- const hb_ot_shape_planner_t -->
-    <qualified-type-def type-id='type-id-2011' const='yes' id='type-id-2021'/>
+    <qualified-type-def type-id='type-id-2009' const='yes' id='type-id-2019'/>
     <!-- const hb_ot_shape_planner_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-2021' size-in-bits='64' id='type-id-2014'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2019' size-in-bits='64' id='type-id-2012'/>
     <!-- const hb_shape_plan_t -->
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-2022'/>
+    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-2020'/>
     <!-- const hb_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-2022' size-in-bits='64' id='type-id-2013'/>
+    <pointer-type-def type-id='type-id-2020' size-in-bits='64' id='type-id-2011'/>
     <!-- hb_ot_shape_plan_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1791' size-in-bits='64' id='type-id-2015'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1795' size-in-bits='64' id='type-id-2013'/>
     <!-- hb_ot_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-1791' size-in-bits='64' id='type-id-1817'/>
+    <pointer-type-def type-id='type-id-1795' size-in-bits='64' id='type-id-1815'/>
     <!-- hb_ot_shape_planner_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-2011' size-in-bits='64' id='type-id-2023'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2009' size-in-bits='64' id='type-id-2021'/>
     <!-- hb_ot_shape_planner_t* -->
-    <pointer-type-def type-id='type-id-2011' size-in-bits='64' id='type-id-2012'/>
+    <pointer-type-def type-id='type-id-2009' size-in-bits='64' id='type-id-2010'/>
     <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* -->
-    <pointer-type-def type-id='type-id-2024' size-in-bits='64' id='type-id-2006'/>
+    <pointer-type-def type-id='type-id-2022' size-in-bits='64' id='type-id-2004'/>
     <!-- void (hb_ot_shape_planner_t*)* -->
-    <pointer-type-def type-id='type-id-2025' size-in-bits='64' id='type-id-2004'/>
+    <pointer-type-def type-id='type-id-2023' size-in-bits='64' id='type-id-2002'/>
     <!-- void* (const hb_ot_shape_plan_t*)* -->
-    <pointer-type-def type-id='type-id-2026' size-in-bits='64' id='type-id-2005'/>
+    <pointer-type-def type-id='type-id-2024' size-in-bits='64' id='type-id-2003'/>
     <!-- void hb_ot_shape_plan_collect_lookups(hb_shape_plan_t*, hb_tag_t, hb_set_t*) -->
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='741' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='741' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='742' column='1'/>
+      <parameter type-id='type-id-958' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='742' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
@@ -31166,18 +31153,18 @@
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
-      <parameter type-id='type-id-336' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
+      <parameter type-id='type-id-334' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='773' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- bool (const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
-    <function-type size-in-bits='64' id='type-id-2016'>
+    <function-type size-in-bits='64' id='type-id-2014'>
       <!-- parameter of type 'const hb_ot_shape_normalize_context_t*' -->
-      <parameter type-id='type-id-2020'/>
+      <parameter type-id='type-id-2018'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
@@ -31188,9 +31175,9 @@
       <return type-id='type-id-1'/>
     </function-type>
     <!-- bool (const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
-    <function-type size-in-bits='64' id='type-id-2017'>
+    <function-type size-in-bits='64' id='type-id-2015'>
       <!-- parameter of type 'const hb_ot_shape_normalize_context_t*' -->
-      <parameter type-id='type-id-2020'/>
+      <parameter type-id='type-id-2018'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -31201,9 +31188,9 @@
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
-    <function-type size-in-bits='64' id='type-id-2024'>
+    <function-type size-in-bits='64' id='type-id-2022'>
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
-      <parameter type-id='type-id-958'/>
+      <parameter type-id='type-id-956'/>
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'hb_font_t*' -->
@@ -31212,38 +31199,38 @@
       <return type-id='type-id-23'/>
     </function-type>
     <!-- void (hb_ot_shape_planner_t*) -->
-    <function-type size-in-bits='64' id='type-id-2025'>
+    <function-type size-in-bits='64' id='type-id-2023'>
       <!-- parameter of type 'hb_ot_shape_planner_t*' -->
-      <parameter type-id='type-id-2012'/>
+      <parameter type-id='type-id-2010'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-type>
     <!-- void* (const hb_ot_shape_plan_t*) -->
-    <function-type size-in-bits='64' id='type-id-2026'>
+    <function-type size-in-bits='64' id='type-id-2024'>
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
-      <parameter type-id='type-id-958'/>
+      <parameter type-id='type-id-956'/>
       <!-- void* -->
       <return type-id='type-id-17'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- hb_tag_t* -->
-    <pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-965'/>
     <!-- void hb_ot_tags_from_script(hb_script_t, hb_tag_t*, hb_tag_t*) -->
     <function-decl name='hb_ot_tags_from_script' mangled-name='hb_ot_tags_from_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tags_from_script'>
       <!-- parameter of type 'enum hb_script_t' -->
       <parameter type-id='type-id-106' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
-      <parameter type-id='type-id-967' name='script_tag_1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='131' column='1'/>
+      <parameter type-id='type-id-965' name='script_tag_1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='131' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
-      <parameter type-id='type-id-967' name='script_tag_2' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='132' column='1'/>
+      <parameter type-id='type-id-965' name='script_tag_2' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='132' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_script_t hb_ot_tag_to_script(hb_tag_t) -->
     <function-decl name='hb_ot_tag_to_script' mangled-name='hb_ot_tag_to_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_script'>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='147' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='147' column='1'/>
       <!-- enum hb_script_t -->
       <return type-id='type-id-106'/>
     </function-decl>
@@ -31252,27 +31239,27 @@
       <!-- parameter of type 'typedef hb_language_t' -->
       <parameter type-id='type-id-107' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1'/>
       <!-- typedef hb_tag_t -->
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-185'/>
     </function-decl>
     <!-- hb_language_t hb_ot_tag_to_language(hb_tag_t) -->
     <function-decl name='hb_ot_tag_to_language' mangled-name='hb_ot_tag_to_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_language'>
       <!-- parameter of type 'typedef hb_tag_t' -->
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1'/>
       <!-- typedef hb_language_t -->
       <return type-id='type-id-107'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- elt_t[2048] -->
-    <array-type-def dimensions='1' type-id='type-id-2027' size-in-bits='65536' id='type-id-2028'>
+    <array-type-def dimensions='1' type-id='type-id-2025' size-in-bits='65536' id='type-id-2026'>
       <!-- <anonymous range>[2048] -->
-      <subrange length='2048' type-id='type-id-4' id='type-id-2029'/>
+      <subrange length='2048' type-id='type-id-4' id='type-id-2027'/>
     </array-type-def>
     <!-- struct hb_set_t -->
-    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-2030'>
+    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-2028'>
       <member-type access='public'>
         <!-- typedef uint32_t hb_set_t::elt_t -->
-        <typedef-decl name='elt_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-2027'/>
+        <typedef-decl name='elt_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-2025'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_set_t::header -->
@@ -31308,15 +31295,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- hb_set_t::elt_t hb_set_t::elts[2048] -->
-        <var-decl name='elts' type-id='type-id-2028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
+        <var-decl name='elts' type-id='type-id-2026' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- bool hb_set_t::is_equal(const hb_set_t*) -->
         <function-decl name='is_equal' mangled-name='_ZNK8hb_set_t8is_equalEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2029'/>
           <!-- bool -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -31325,7 +31312,7 @@
         <!-- hb_codepoint_t hb_set_t::get_min() -->
         <function-decl name='get_min' mangled-name='_ZNK8hb_set_t7get_minEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- typedef hb_codepoint_t -->
           <return type-id='type-id-64'/>
         </function-decl>
@@ -31334,7 +31321,7 @@
         <!-- hb_codepoint_t hb_set_t::get_max() -->
         <function-decl name='get_max' mangled-name='_ZNK8hb_set_t7get_maxEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- typedef hb_codepoint_t -->
           <return type-id='type-id-64'/>
         </function-decl>
@@ -31343,7 +31330,7 @@
         <!-- bool hb_set_t::is_empty() -->
         <function-decl name='is_empty' mangled-name='_ZNK8hb_set_t8is_emptyEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- bool -->
           <return type-id='type-id-1'/>
         </function-decl>
@@ -31352,29 +31339,29 @@
         <!-- hb_set_t::elt_t hb_set_t::elt(hb_codepoint_t) -->
         <function-decl name='elt' mangled-name='_ZNK8hb_set_t3eltEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- typedef hb_set_t::elt_t -->
-          <return type-id='type-id-2027'/>
+          <return type-id='type-id-2025'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_set_t::elt_t hb_set_t::mask(hb_codepoint_t) -->
         <function-decl name='mask' mangled-name='_ZNK8hb_set_t4maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- typedef hb_set_t::elt_t -->
-          <return type-id='type-id-2027'/>
+          <return type-id='type-id-2025'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- bool hb_set_t::has(hb_codepoint_t) -->
         <function-decl name='has' mangled-name='_ZNK8hb_set_t3hasEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- bool -->
@@ -31385,7 +31372,7 @@
         <!-- bool hb_set_t::next_range(hb_codepoint_t*, hb_codepoint_t*) -->
         <function-decl name='next_range' mangled-name='_ZNK8hb_set_t10next_rangeEPjS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-127'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
@@ -31398,7 +31385,7 @@
         <!-- void hb_set_t::invert() -->
         <function-decl name='invert' mangled-name='_ZN8hb_set_t6invertEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31407,9 +31394,9 @@
         <!-- void hb_set_t::symmetric_difference(const hb_set_t*) -->
         <function-decl name='symmetric_difference' mangled-name='_ZN8hb_set_t20symmetric_differenceEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2029'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31418,9 +31405,9 @@
         <!-- void hb_set_t::subtract(const hb_set_t*) -->
         <function-decl name='subtract' mangled-name='_ZN8hb_set_t8subtractEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2029'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31429,9 +31416,9 @@
         <!-- void hb_set_t::intersect(const hb_set_t*) -->
         <function-decl name='intersect' mangled-name='_ZN8hb_set_t9intersectEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2029'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31440,9 +31427,9 @@
         <!-- void hb_set_t::union_(const hb_set_t*) -->
         <function-decl name='union_' mangled-name='_ZN8hb_set_t6union_EPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2029'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31451,9 +31438,9 @@
         <!-- void hb_set_t::set(const hb_set_t*) -->
         <function-decl name='set' mangled-name='_ZN8hb_set_t3setEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2029'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31462,18 +31449,18 @@
         <!-- hb_set_t::elt_t& hb_set_t::elt(hb_codepoint_t) -->
         <function-decl name='elt' mangled-name='_ZN8hb_set_t3eltEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- hb_set_t::elt_t& -->
-          <return type-id='type-id-2033'/>
+          <return type-id='type-id-2031'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_set_t::del(hb_codepoint_t) -->
         <function-decl name='del' mangled-name='_ZN8hb_set_t3delEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- void -->
@@ -31484,7 +31471,7 @@
         <!-- void hb_set_t::del_range(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='del_range' mangled-name='_ZN8hb_set_t9del_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -31497,7 +31484,7 @@
         <!-- void hb_set_t::add(hb_codepoint_t) -->
         <function-decl name='add' mangled-name='_ZN8hb_set_t3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- void -->
@@ -31508,7 +31495,7 @@
         <!-- void hb_set_t::add_range(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='add_range' mangled-name='_ZN8hb_set_t9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -31521,7 +31508,7 @@
         <!-- unsigned int hb_set_t::get_population() -->
         <function-decl name='get_population' mangled-name='_ZNK8hb_set_t14get_populationEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- unsigned int -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -31530,7 +31517,7 @@
         <!-- void hb_set_t::clear() -->
         <function-decl name='clear' mangled-name='_ZN8hb_set_t5clearEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31539,7 +31526,7 @@
         <!-- void hb_set_t::fini() -->
         <function-decl name='fini' mangled-name='_ZN8hb_set_t4finiEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
@@ -31548,7 +31535,7 @@
         <!-- bool hb_set_t::next(hb_codepoint_t*) -->
         <function-decl name='next' mangled-name='_ZNK8hb_set_t4nextEPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-127'/>
           <!-- bool -->
@@ -31559,7 +31546,7 @@
         <!-- bool hb_set_t::intersects(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='intersects' mangled-name='_ZNK8hb_set_t10intersectsEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_set_t*' -->
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
           <parameter type-id='type-id-64'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -31572,54 +31559,54 @@
         <!-- void hb_set_t::init() -->
         <function-decl name='init' mangled-name='_ZN8hb_set_t4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_set_t*' -->
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- const hb_set_t -->
-    <qualified-type-def type-id='type-id-2030' const='yes' id='type-id-2034'/>
+    <qualified-type-def type-id='type-id-2028' const='yes' id='type-id-2032'/>
     <!-- const hb_set_t -->
-    <qualified-type-def type-id='type-id-1882' const='yes' id='type-id-2035'/>
+    <qualified-type-def type-id='type-id-1880' const='yes' id='type-id-2033'/>
     <!-- const hb_set_t* -->
-    <pointer-type-def type-id='type-id-2034' size-in-bits='64' id='type-id-2031'/>
+    <pointer-type-def type-id='type-id-2032' size-in-bits='64' id='type-id-2029'/>
     <!-- const hb_set_t* -->
-    <pointer-type-def type-id='type-id-2035' size-in-bits='64' id='type-id-1842'/>
+    <pointer-type-def type-id='type-id-2033' size-in-bits='64' id='type-id-1840'/>
     <!-- hb_set_t* -->
-    <pointer-type-def type-id='type-id-2030' size-in-bits='64' id='type-id-2032'/>
+    <pointer-type-def type-id='type-id-2028' size-in-bits='64' id='type-id-2030'/>
     <!-- hb_set_t* -->
-    <pointer-type-def type-id='type-id-1882' size-in-bits='64' id='type-id-960'/>
+    <pointer-type-def type-id='type-id-1880' size-in-bits='64' id='type-id-958'/>
     <!-- hb_set_t::elt_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-2027' size-in-bits='64' id='type-id-2033'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2025' size-in-bits='64' id='type-id-2031'/>
     <!-- hb_set_t* hb_set_create() -->
     <function-decl name='hb_set_create' mangled-name='hb_set_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_create'>
       <!-- hb_set_t* -->
-      <return type-id='type-id-960'/>
+      <return type-id='type-id-958'/>
     </function-decl>
     <!-- hb_set_t* hb_set_get_empty() -->
     <function-decl name='hb_set_get_empty' mangled-name='hb_set_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_empty'>
       <!-- hb_set_t* -->
-      <return type-id='type-id-960'/>
+      <return type-id='type-id-958'/>
     </function-decl>
     <!-- hb_set_t* hb_set_reference(hb_set_t*) -->
     <function-decl name='hb_set_reference' mangled-name='hb_set_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_reference'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1'/>
       <!-- hb_set_t* -->
-      <return type-id='type-id-960'/>
+      <return type-id='type-id-958'/>
     </function-decl>
     <!-- void hb_set_destroy(hb_set_t*) -->
     <function-decl name='hb_set_destroy' mangled-name='hb_set_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_destroy'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='94' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='94' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_set_set_user_data(hb_set_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_set_set_user_data' mangled-name='hb_set_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_set_user_data'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='117' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -31634,7 +31621,7 @@
     <!-- void* hb_set_get_user_data(hb_set_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_set_get_user_data' mangled-name='hb_set_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_user_data'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='136' column='1'/>
       <!-- void* -->
@@ -31643,28 +31630,28 @@
     <!-- hb_bool_t hb_set_allocation_successful(const hb_set_t*) -->
     <function-decl name='hb_set_allocation_successful' mangled-name='hb_set_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_allocation_successful'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- void hb_set_clear(hb_set_t*) -->
     <function-decl name='hb_set_clear' mangled-name='hb_set_clear' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_clear'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='167' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='167' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_set_is_empty(const hb_set_t*) -->
     <function-decl name='hb_set_is_empty' mangled-name='hb_set_is_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_is_empty'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='183' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='183' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- hb_bool_t hb_set_has(const hb_set_t*, hb_codepoint_t) -->
     <function-decl name='hb_set_has' mangled-name='hb_set_has' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_has'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='201' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -31673,7 +31660,7 @@
     <!-- void hb_set_add(hb_set_t*, hb_codepoint_t) -->
     <function-decl name='hb_set_add' mangled-name='hb_set_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_add'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='216' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='216' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='217' column='1'/>
       <!-- void -->
@@ -31682,7 +31669,7 @@
     <!-- void hb_set_add_range(hb_set_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_set_add_range' mangled-name='hb_set_add_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_add_range'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='233' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='233' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='234' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -31693,7 +31680,7 @@
     <!-- void hb_set_del(hb_set_t*, hb_codepoint_t) -->
     <function-decl name='hb_set_del' mangled-name='hb_set_del' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_del'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
       <!-- void -->
@@ -31702,7 +31689,7 @@
     <!-- void hb_set_del_range(hb_set_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_set_del_range' mangled-name='hb_set_del_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_del_range'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-64' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='268' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -31713,89 +31700,89 @@
     <!-- hb_bool_t hb_set_is_equal(const hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_is_equal' mangled-name='hb_set_is_equal' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='286' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_is_equal'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='286' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='286' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='287' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='287' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- void hb_set_set(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_set' mangled-name='hb_set_set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_set'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='302' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='302' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='303' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='303' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- void hb_set_union(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_union' mangled-name='hb_set_union' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_union'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='318' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='318' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='319' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='319' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- void hb_set_intersect(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_intersect' mangled-name='hb_set_intersect' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_intersect'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='334' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='334' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='335' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='335' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- void hb_set_subtract(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_subtract' mangled-name='hb_set_subtract' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_subtract'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='350' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='350' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='351' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='351' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- void hb_set_symmetric_difference(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_symmetric_difference' mangled-name='hb_set_symmetric_difference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_symmetric_difference'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- void hb_set_invert(hb_set_t*) -->
     <function-decl name='hb_set_invert' mangled-name='hb_set_invert' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_invert'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- unsigned int hb_set_get_population(const hb_set_t*) -->
     <function-decl name='hb_set_get_population' mangled-name='hb_set_get_population' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_population'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-12'/>
     </function-decl>
     <!-- hb_codepoint_t hb_set_get_min(const hb_set_t*) -->
     <function-decl name='hb_set_get_min' mangled-name='hb_set_get_min' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_min'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1'/>
       <!-- typedef hb_codepoint_t -->
       <return type-id='type-id-64'/>
     </function-decl>
     <!-- hb_codepoint_t hb_set_get_max(const hb_set_t*) -->
     <function-decl name='hb_set_get_max' mangled-name='hb_set_get_max' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_max'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='429' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='429' column='1'/>
       <!-- typedef hb_codepoint_t -->
       <return type-id='type-id-64'/>
     </function-decl>
     <!-- hb_bool_t hb_set_next(const hb_set_t*, hb_codepoint_t*) -->
     <function-decl name='hb_set_next' mangled-name='hb_set_next' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_next'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
       <parameter type-id='type-id-127' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='447' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -31804,7 +31791,7 @@
     <!-- hb_bool_t hb_set_next_range(const hb_set_t*, hb_codepoint_t*, hb_codepoint_t*) -->
     <function-decl name='hb_set_next_range' mangled-name='hb_set_next_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_next_range'>
       <!-- parameter of type 'const hb_set_t*' -->
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
       <parameter type-id='type-id-127' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='467' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
@@ -31813,47 +31800,47 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- typedef hb_set_t hb_set_t -->
-    <typedef-decl name='hb_set_t' type-id='type-id-2030' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1882'/>
+    <typedef-decl name='hb_set_t' type-id='type-id-2028' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1880'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-shape-plan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- hb_shape_plan_t* hb_shape_plan_create(hb_face_t*, const hb_segment_properties_t*, const hb_feature_t*, unsigned int, const char* const*) -->
     <function-decl name='hb_shape_plan_create' mangled-name='hb_shape_plan_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_create'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
-      <parameter type-id='type-id-175' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='113' column='1'/>
+      <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='113' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
-      <parameter type-id='type-id-336' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='114' column='1'/>
+      <parameter type-id='type-id-334' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='114' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='num_user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='115' column='1'/>
       <!-- parameter of type 'const char* const*' -->
-      <parameter type-id='type-id-2036' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='116' column='1'/>
+      <parameter type-id='type-id-2034' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='116' column='1'/>
       <!-- hb_shape_plan_t* -->
-      <return type-id='type-id-195'/>
+      <return type-id='type-id-193'/>
     </function-decl>
     <!-- hb_shape_plan_t* hb_shape_plan_get_empty() -->
     <function-decl name='hb_shape_plan_get_empty' mangled-name='hb_shape_plan_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_empty'>
       <!-- hb_shape_plan_t* -->
-      <return type-id='type-id-195'/>
+      <return type-id='type-id-193'/>
     </function-decl>
     <!-- hb_shape_plan_t* hb_shape_plan_reference(hb_shape_plan_t*) -->
     <function-decl name='hb_shape_plan_reference' mangled-name='hb_shape_plan_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_reference'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='200' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='200' column='1'/>
       <!-- hb_shape_plan_t* -->
-      <return type-id='type-id-195'/>
+      <return type-id='type-id-193'/>
     </function-decl>
     <!-- void hb_shape_plan_destroy(hb_shape_plan_t*) -->
     <function-decl name='hb_shape_plan_destroy' mangled-name='hb_shape_plan_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_destroy'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='214' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='214' column='1'/>
       <!-- void -->
       <return type-id='type-id-23'/>
     </function-decl>
     <!-- hb_bool_t hb_shape_plan_set_user_data(hb_shape_plan_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_shape_plan_set_user_data' mangled-name='hb_shape_plan_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_set_user_data'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='242' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='242' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='243' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -31868,7 +31855,7 @@
     <!-- void* hb_shape_plan_get_user_data(hb_shape_plan_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_shape_plan_get_user_data' mangled-name='hb_shape_plan_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_user_data'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='263' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='263' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='264' column='1'/>
       <!-- void* -->
@@ -31877,13 +31864,13 @@
     <!-- hb_bool_t hb_shape_plan_execute(hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) -->
     <function-decl name='hb_shape_plan_execute' mangled-name='hb_shape_plan_execute' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_execute'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='286' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='287' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
-      <parameter type-id='type-id-336' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='288' column='1'/>
+      <parameter type-id='type-id-334' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='288' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='289' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -31892,31 +31879,31 @@
     <!-- hb_shape_plan_t* hb_shape_plan_create_cached(hb_face_t*, const hb_segment_properties_t*, const hb_feature_t*, unsigned int, const char* const*) -->
     <function-decl name='hb_shape_plan_create_cached' mangled-name='hb_shape_plan_create_cached' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_create_cached'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='402' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='402' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
-      <parameter type-id='type-id-175' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='403' column='1'/>
+      <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='403' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
-      <parameter type-id='type-id-336' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='404' column='1'/>
+      <parameter type-id='type-id-334' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='404' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='num_user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='405' column='1'/>
       <!-- parameter of type 'const char* const*' -->
-      <parameter type-id='type-id-2036' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='406' column='1'/>
+      <parameter type-id='type-id-2034' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='406' column='1'/>
       <!-- hb_shape_plan_t* -->
-      <return type-id='type-id-195'/>
+      <return type-id='type-id-193'/>
     </function-decl>
     <!-- const char* hb_shape_plan_get_shaper(hb_shape_plan_t*) -->
     <function-decl name='hb_shape_plan_get_shaper' mangled-name='hb_shape_plan_get_shaper' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_shaper'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='489' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='489' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-15'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- const char* const -->
-    <qualified-type-def type-id='type-id-15' const='yes' id='type-id-2037'/>
+    <qualified-type-def type-id='type-id-15' const='yes' id='type-id-2035'/>
     <!-- const char* const* -->
-    <pointer-type-def type-id='type-id-2037' size-in-bits='64' id='type-id-2036'/>
+    <pointer-type-def type-id='type-id-2035' size-in-bits='64' id='type-id-2034'/>
     <!-- hb_bool_t hb_feature_from_string(const char*, int, hb_feature_t*) -->
     <function-decl name='hb_feature_from_string' mangled-name='hb_feature_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_feature_from_string'>
       <!-- parameter of type 'const char*' -->
@@ -31924,14 +31911,14 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-9' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='212' column='1'/>
       <!-- parameter of type 'hb_feature_t*' -->
-      <parameter type-id='type-id-219' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='213' column='1'/>
+      <parameter type-id='type-id-217' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='213' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- void hb_feature_to_string(hb_feature_t*, char*, unsigned int) -->
     <function-decl name='hb_feature_to_string' mangled-name='hb_feature_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_feature_to_string'>
       <!-- parameter of type 'hb_feature_t*' -->
-      <parameter type-id='type-id-219' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1'/>
+      <parameter type-id='type-id-217' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-45' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='244' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -31951,11 +31938,11 @@
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
-      <parameter type-id='type-id-336' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
+      <parameter type-id='type-id-334' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='350' column='1'/>
       <!-- parameter of type 'const char* const*' -->
-      <parameter type-id='type-id-2036' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='351' column='1'/>
+      <parameter type-id='type-id-2034' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='351' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-35'/>
     </function-decl>
@@ -31966,7 +31953,7 @@
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
-      <parameter type-id='type-id-336' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
+      <parameter type-id='type-id-334' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='382' column='1'/>
       <!-- void -->

diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 14c708e0a3ff7a93236148d3000fdc01d6635019..c205dc526728cf5b3e70700616e8d8d702af5eca 100644 (file)
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -8665,26 +8665,26 @@
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-381'/>
     <!-- ht_identifier* -->
     <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-418'/>
+    <!-- typedef hashnode (hash_table*)* -->
+    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-348'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-372'/>
+    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-372'/>
     <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-332'/>
     <!-- macro_context* -->
     <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-364'/>
     <!-- op* -->
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-267'/>
     <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-380'/>
     <!-- time_t* -->
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-422'/>
+    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-423'/>
     <!-- tm* -->
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-423'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-424'/>
     <!-- tokenrun* -->
     <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
     <!-- tokenrun* -->
     <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-295'/>
-    <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-348'/>
     <!-- uchar* -->
     <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-234'/>
     <!-- unsigned char* -->
@@ -8716,9 +8716,9 @@
     <!-- struct file_hash_entry_pool -->
     <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-416'/>
     <!-- struct if_stack -->
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-419'/>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-420'/>
     <!-- struct pragma_entry -->
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-421'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-422'/>
     <!-- typedef unsigned char uchar -->
     <typedef-decl name='uchar' type-id='type-id-29' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-408'/>
     <!-- typedef cpp_reader cpp_reader -->
@@ -8910,7 +8910,7 @@
     <!-- time_t time(time_t*) -->
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'time_t*' -->
-      <parameter type-id='type-id-422'/>
+      <parameter type-id='type-id-423'/>
       <!-- typedef time_t -->
       <return type-id='type-id-403'/>
     </function-decl>
@@ -8919,7 +8919,7 @@
       <!-- parameter of type 'const time_t*' -->
       <parameter type-id='type-id-405'/>
       <!-- tm* -->
-      <return type-id='type-id-423'/>
+      <return type-id='type-id-424'/>
     </function-decl>
     <!-- char* asctime(const tm*) -->
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8998,8 +8998,15 @@
       <!-- cpp_hashnode* -->
       <return type-id='type-id-233'/>
     </function-type>
+    <!-- hashnode (hash_table*) -->
+    <function-type size-in-bits='64' id='type-id-419'>
+      <!-- parameter of type 'hash_table*' -->
+      <parameter type-id='type-id-285'/>
+      <!-- typedef hashnode -->
+      <return type-id='type-id-288'/>
+    </function-type>
     <!-- int (cpp_reader*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-420'>
+    <function-type size-in-bits='64' id='type-id-421'>
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-225'/>
       <!-- parameter of type 'const char*' -->
@@ -9009,13 +9016,6 @@
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-type>
-    <!-- hashnode (hash_table*) -->
-    <function-type size-in-bits='64' id='type-id-424'>
-      <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-285'/>
-      <!-- typedef hashnode -->
-      <return type-id='type-id-288'/>
-    </function-type>
     <!-- void (cpp_reader*, const char*) -->
     <function-type size-in-bits='64' id='type-id-425'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -10715,14 +10715,14 @@
     <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-497'/>
     <!-- int (pex_obj*, int*, int)* -->
     <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-499'/>
+    <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-496'/>
+    <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
+    <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-498'/>
     <!-- pex_time* -->
     <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-144'/>
     <!-- pid_t* -->
-    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-143'/>
-    <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-496'/>
-    <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-143'/>
     <!-- void (pex_obj*)* -->
     <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-501'/>
     <!-- pex_obj* pex_init_common(int, const char*, const char*, const pex_funcs*) -->
@@ -10802,7 +10802,7 @@
     <!-- typedef int __pid_t -->
     <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-511'/>
     <!-- typedef __pid_t pid_t -->
-    <typedef-decl name='pid_t' type-id='type-id-511' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-507'/>
+    <typedef-decl name='pid_t' type-id='type-id-511' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-509'/>
     <!-- FILE* (pex_obj*, int, int) -->
     <function-type size-in-bits='64' id='type-id-502'>
       <!-- parameter of type 'pex_obj*' -->
@@ -10846,7 +10846,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*) -->
-    <function-type size-in-bits='64' id='type-id-508'>
+    <function-type size-in-bits='64' id='type-id-507'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-121'/>
       <!-- parameter of type 'int' -->
@@ -10870,14 +10870,14 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-51'/>
       <!-- typedef pid_t -->
-      <return type-id='type-id-507'/>
+      <return type-id='type-id-509'/>
     </function-type>
     <!-- pid_t (pex_obj*, pid_t, int*, pex_time*, int, const char**, int*) -->
-    <function-type size-in-bits='64' id='type-id-509'>
+    <function-type size-in-bits='64' id='type-id-508'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-121'/>
       <!-- parameter of type 'typedef pid_t' -->
-      <parameter type-id='type-id-507'/>
+      <parameter type-id='type-id-509'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-51'/>
       <!-- parameter of type 'pex_time*' -->
@@ -10889,7 +10889,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-51'/>
       <!-- typedef pid_t -->
-      <return type-id='type-id-507'/>
+      <return type-id='type-id-509'/>
     </function-type>
     <!-- void (pex_obj*) -->
     <function-type size-in-bits='64' id='type-id-510'>

diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index a5aa4cf5e53ce5ac3d06d220ee339550e1990b60..db6d8137ff1cc3891fb6b67568bf1a90bb9e24ac 100644 (file)
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -9092,193 +9092,199 @@
     <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-940'/>
     <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-941'/>
     <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-355'/>
-    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-1068'/>
+    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-618'/>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-510'/>
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-395'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-741'/>
+    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-341'/>
+    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-1074'/>
     <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-788'/>
     <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-782'/>
     <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-262'/>
     <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-883'/>
     <pointer-type-def type-id='type-id-883' size-in-bits='64' id='type-id-21'/>
-    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-943'/>
-    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-377'/>
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-911'/>
-    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-821'/>
+    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-943'/>
+    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-377'/>
+    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-911'/>
+    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-821'/>
     <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-24'/>
-    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-275'/>
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-269'/>
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-275'/>
     <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-297'/>
-    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-948'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-948'/>
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-761'/>
-    <qualified-type-def type-id='type-id-756' const='yes' id='type-id-1078'/>
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-265'/>
-    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-1079'/>
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-352'/>
-    <qualified-type-def type-id='type-id-984' const='yes' id='type-id-1080'/>
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1081'/>
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-251'/>
-    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-1082'/>
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-455'/>
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1085'/>
-    <qualified-type-def type-id='type-id-1085' const='yes' id='type-id-612'/>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-669'/>
+    <qualified-type-def type-id='type-id-756' const='yes' id='type-id-1084'/>
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-265'/>
+    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-1085'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-352'/>
+    <qualified-type-def type-id='type-id-984' const='yes' id='type-id-1086'/>
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1087'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-251'/>
+    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-1088'/>
+    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1091'/>
+    <qualified-type-def type-id='type-id-1091' const='yes' id='type-id-612'/>
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-669'/>
     <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-718'/>
-    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-1087'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-924'/>
-    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-1088'/>
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-386'/>
-    <qualified-type-def type-id='type-id-224' const='yes' id='type-id-1089'/>
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-1090'/>
-    <qualified-type-def type-id='type-id-234' const='yes' id='type-id-1091'/>
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-229'/>
-    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-1092'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-650'/>
-    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-1093'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-257'/>
-    <qualified-type-def type-id='type-id-279' const='yes' id='type-id-1094'/>
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
-    <qualified-type-def type-id='type-id-274' const='yes' id='type-id-1096'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-282'/>
-    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-1097'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-289'/>
-    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1098'/>
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-414'/>
-    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1100'/>
-    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-416'/>
-    <qualified-type-def type-id='type-id-388' const='yes' id='type-id-1101'/>
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-402'/>
-    <qualified-type-def type-id='type-id-429' const='yes' id='type-id-1102'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-374'/>
-    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-1104'/>
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-497'/>
+    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-1093'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-924'/>
+    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-386'/>
+    <qualified-type-def type-id='type-id-224' const='yes' id='type-id-1095'/>
+    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1096'/>
+    <qualified-type-def type-id='type-id-234' const='yes' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-229'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-650'/>
+    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-1099'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-257'/>
+    <qualified-type-def type-id='type-id-279' const='yes' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
+    <qualified-type-def type-id='type-id-274' const='yes' id='type-id-1102'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-282'/>
+    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-1103'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-289'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1104'/>
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-414'/>
     <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1106'/>
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-418'/>
-    <qualified-type-def type-id='type-id-500' const='yes' id='type-id-1107'/>
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-503'/>
-    <qualified-type-def type-id='type-id-505' const='yes' id='type-id-1108'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-501'/>
-    <qualified-type-def type-id='type-id-360' const='yes' id='type-id-1109'/>
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1110'/>
-    <qualified-type-def type-id='type-id-453' const='yes' id='type-id-1111'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-362'/>
-    <qualified-type-def type-id='type-id-53' const='yes' id='type-id-1112'/>
-    <qualified-type-def type-id='type-id-1113' const='yes' id='type-id-1114'/>
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-258'/>
-    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-1115'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-416'/>
+    <qualified-type-def type-id='type-id-388' const='yes' id='type-id-1107'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-402'/>
+    <qualified-type-def type-id='type-id-429' const='yes' id='type-id-1108'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-374'/>
+    <qualified-type-def type-id='type-id-1109' const='yes' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-497'/>
+    <qualified-type-def type-id='type-id-1111' const='yes' id='type-id-1112'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-418'/>
+    <qualified-type-def type-id='type-id-500' const='yes' id='type-id-1113'/>
+    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-503'/>
+    <qualified-type-def type-id='type-id-505' const='yes' id='type-id-1114'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-501'/>
+    <qualified-type-def type-id='type-id-360' const='yes' id='type-id-1115'/>
     <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1116'/>
-    <qualified-type-def type-id='type-id-793' const='yes' id='type-id-1117'/>
-    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-797'/>
-    <qualified-type-def type-id='type-id-318' const='yes' id='type-id-1118'/>
-    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-777'/>
-    <qualified-type-def type-id='type-id-567' const='yes' id='type-id-1119'/>
-    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-549'/>
-    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-1120'/>
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-1121'/>
-    <qualified-type-def type-id='type-id-1122' const='yes' id='type-id-1123'/>
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1124'/>
-    <qualified-type-def type-id='type-id-617' const='yes' id='type-id-1125'/>
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-271'/>
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-606'/>
-    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-1127'/>
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-802'/>
-    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-1128'/>
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-801'/>
-    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-1129'/>
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-615'/>
-    <qualified-type-def type-id='type-id-391' const='yes' id='type-id-1130'/>
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-403'/>
-    <qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1132'/>
-    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-754'/>
-    <qualified-type-def type-id='type-id-738' const='yes' id='type-id-1133'/>
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-755'/>
-    <qualified-type-def type-id='type-id-167' const='yes' id='type-id-1134'/>
-    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-747'/>
-    <qualified-type-def type-id='type-id-758' const='yes' id='type-id-1135'/>
-    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-264'/>
-    <qualified-type-def type-id='type-id-384' const='yes' id='type-id-1136'/>
-    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1137'/>
-    <qualified-type-def type-id='type-id-1138' const='yes' id='type-id-1139'/>
-    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-814'/>
-    <qualified-type-def type-id='type-id-220' const='yes' id='type-id-1140'/>
-    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
-    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-1142'/>
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-41'/>
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1143'/>
-    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-415'/>
-    <qualified-type-def type-id='type-id-723' const='yes' id='type-id-1144'/>
-    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-778'/>
-    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1146'/>
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-922'/>
-    <qualified-type-def type-id='type-id-179' const='yes' id='type-id-1147'/>
-    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-165'/>
-    <qualified-type-def type-id='type-id-475' const='yes' id='type-id-1148'/>
-    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-413'/>
-    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-1149'/>
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-604'/>
+    <qualified-type-def type-id='type-id-453' const='yes' id='type-id-1117'/>
+    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-362'/>
+    <qualified-type-def type-id='type-id-53' const='yes' id='type-id-1118'/>
+    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1120'/>
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-258'/>
+    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-1121'/>
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1122'/>
+    <qualified-type-def type-id='type-id-793' const='yes' id='type-id-1123'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-797'/>
+    <qualified-type-def type-id='type-id-318' const='yes' id='type-id-1124'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-777'/>
+    <qualified-type-def type-id='type-id-567' const='yes' id='type-id-1125'/>
+    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-549'/>
+    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-1126'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1127'/>
+    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1129'/>
+    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1130'/>
+    <qualified-type-def type-id='type-id-617' const='yes' id='type-id-1131'/>
+    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-271'/>
+    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-606'/>
+    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-1133'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-802'/>
+    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-801'/>
+    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-1135'/>
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-615'/>
+    <qualified-type-def type-id='type-id-391' const='yes' id='type-id-1136'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-403'/>
+    <qualified-type-def type-id='type-id-1137' const='yes' id='type-id-1138'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-754'/>
+    <qualified-type-def type-id='type-id-738' const='yes' id='type-id-1139'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-755'/>
+    <qualified-type-def type-id='type-id-167' const='yes' id='type-id-1140'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-747'/>
+    <qualified-type-def type-id='type-id-758' const='yes' id='type-id-1141'/>
+    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-264'/>
+    <qualified-type-def type-id='type-id-384' const='yes' id='type-id-1142'/>
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1143'/>
+    <qualified-type-def type-id='type-id-1144' const='yes' id='type-id-1145'/>
+    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-814'/>
+    <qualified-type-def type-id='type-id-220' const='yes' id='type-id-1146'/>
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1147'/>
+    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-1148'/>
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-41'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1149'/>
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-415'/>
+    <qualified-type-def type-id='type-id-723' const='yes' id='type-id-1150'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-778'/>
+    <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1152'/>
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-922'/>
+    <qualified-type-def type-id='type-id-179' const='yes' id='type-id-1153'/>
+    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-165'/>
+    <qualified-type-def type-id='type-id-475' const='yes' id='type-id-1154'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-413'/>
+    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-1155'/>
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-604'/>
     <qualified-type-def type-id='type-id-204' const='yes' id='type-id-798'/>
-    <qualified-type-def type-id='type-id-111' const='yes' id='type-id-1150'/>
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-222'/>
+    <qualified-type-def type-id='type-id-111' const='yes' id='type-id-1156'/>
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-222'/>
     <qualified-type-def type-id='type-id-113' const='yes' id='type-id-373'/>
     <qualified-type-def type-id='type-id-114' const='yes' id='type-id-642'/>
-    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-1151'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-566'/>
-    <qualified-type-def type-id='type-id-1152' const='yes' id='type-id-1153'/>
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-1154'/>
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-417'/>
+    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-566'/>
+    <qualified-type-def type-id='type-id-1158' const='yes' id='type-id-1159'/>
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1160'/>
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-417'/>
     <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-702'/>
     <pointer-type-def type-id='type-id-693' size-in-bits='64' id='type-id-695'/>
-    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-946'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-1156'/>
+    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-946'/>
+    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-1162'/>
     <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-227'/>
-    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-498'/>
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-454'/>
     <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-687'/>
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-288'/>
+    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-288'/>
     <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-286'/>
-    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-845'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-845'/>
     <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-250'/>
     <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-291'/>
     <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-283'/>
     <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-294'/>
-    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-1163'/>
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-1164'/>
-    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-292'/>
-    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1166'/>
-    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-863'/>
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-1168'/>
-    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-492'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-522'/>
-    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-623'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-1169'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-1170'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-292'/>
+    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1172'/>
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-863'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1174'/>
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-492'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-623'/>
     <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-780'/>
     <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-401'/>
     <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-426'/>
-    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-1173'/>
+    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-1179'/>
     <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-323'/>
     <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-1174'/>
+    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-1180'/>
     <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-369'/>
     <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-412'/>
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-931'/>
-    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-1177'/>
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-930'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-371'/>
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-950'/>
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-949'/>
-    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-1183'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-931'/>
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1183'/>
+    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-372'/>
+    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-371'/>
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-950'/>
+    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-949'/>
+    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-1189'/>
     <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-513'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-515'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-514'/>
-    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-506'/>
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1188'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-357'/>
+    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-513'/>
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-515'/>
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-514'/>
+    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1194'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-357'/>
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-217'/>
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-356'/>
     <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-631'/>
     <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-632'/>
     <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-1005'/>
@@ -9286,407 +9292,401 @@
     <pointer-type-def type-id='type-id-519' size-in-bits='64' id='type-id-526'/>
     <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-523'/>
     <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-524'/>
-    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-1191'/>
+    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-1197'/>
     <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-51'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-476'/>
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-781'/>
-    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-344'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-340'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-795'/>
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-794'/>
-    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-238'/>
-    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-236'/>
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-237'/>
-    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-512'/>
-    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-516'/>
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-511'/>
-    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-517'/>
-    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-469'/>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-244'/>
-    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-239'/>
-    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-459'/>
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-467'/>
-    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-461'/>
-    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-483'/>
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-235'/>
-    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-252'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-253'/>
-    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-309'/>
-    <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-306'/>
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-256'/>
-    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-315'/>
-    <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1223'/>
-    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-860'/>
-    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-332'/>
-    <pointer-type-def type-id='type-id-1226' size-in-bits='64' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-334'/>
-    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-434'/>
-    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-442'/>
-    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-989'/>
-    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-448'/>
-    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-439'/>
-    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-440'/>
-    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-437'/>
-    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-394'/>
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-396'/>
-    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-496'/>
-    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-479'/>
-    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-462'/>
-    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-463'/>
-    <pointer-type-def type-id='type-id-1242' size-in-bits='64' id='type-id-473'/>
-    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-466'/>
-    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-464'/>
-    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-460'/>
-    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-465'/>
-    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-471'/>
-    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-438'/>
-    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-456'/>
-    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-866'/>
-    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-474'/>
-    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-867'/>
-    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-472'/>
-    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-478'/>
-    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-445'/>
-    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-441'/>
-    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-559'/>
-    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-558'/>
-    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-560'/>
-    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-568'/>
-    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-576'/>
-    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-1263'/>
-    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-433'/>
-    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1266'/>
-    <qualified-type-def type-id='type-id-1266' const='yes' id='type-id-611'/>
-    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-1268'/>
-    <qualified-type-def type-id='type-id-1268' const='yes' id='type-id-613'/>
-    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-626'/>
-    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-622'/>
-    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-625'/>
-    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-624'/>
-    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-737'/>
-    <pointer-type-def type-id='type-id-1274' size-in-bits='64' id='type-id-736'/>
-    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-730'/>
-    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-739'/>
-    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-734'/>
-    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-740'/>
-    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-735'/>
-    <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-767'/>
-    <pointer-type-def type-id='type-id-1281' size-in-bits='64' id='type-id-1282'/>
-    <pointer-type-def type-id='type-id-1283' size-in-bits='64' id='type-id-331'/>
-    <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-337'/>
-    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-328'/>
-    <pointer-type-def type-id='type-id-1287' size-in-bits='64' id='type-id-183'/>
-    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-188'/>
-    <pointer-type-def type-id='type-id-1289' size-in-bits='64' id='type-id-488'/>
-    <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-561'/>
-    <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-557'/>
-    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-570'/>
-    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-482'/>
-    <pointer-type-def type-id='type-id-1294' size-in-bits='64' id='type-id-876'/>
-    <pointer-type-def type-id='type-id-1295' size-in-bits='64' id='type-id-481'/>
-    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-484'/>
-    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-873'/>
-    <pointer-type-def type-id='type-id-1298' size-in-bits='64' id='type-id-875'/>
-    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-861'/>
-    <pointer-type-def type-id='type-id-1300' size-in-bits='64' id='type-id-877'/>
-    <pointer-type-def type-id='type-id-1301' size-in-bits='64' id='type-id-493'/>
-    <pointer-type-def type-id='type-id-1302' size-in-bits='64' id='type-id-878'/>
-    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-874'/>
-    <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-468'/>
-    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-457'/>
-    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-489'/>
-    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-664'/>
-    <pointer-type-def type-id='type-id-1309' size-in-bits='64' id='type-id-663'/>
-    <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-668'/>
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-476'/>
+    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-781'/>
+    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-344'/>
+    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-795'/>
+    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-794'/>
+    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-238'/>
+    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-516'/>
+    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-511'/>
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-517'/>
+    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-469'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-461'/>
+    <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-235'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-254'/>
+    <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-253'/>
+    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-256'/>
+    <pointer-type-def type-id='type-id-1226' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-1229'/>
+    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-860'/>
+    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-434'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-448'/>
+    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-439'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-440'/>
+    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-437'/>
+    <pointer-type-def type-id='type-id-1242' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-396'/>
+    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-463'/>
+    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-473'/>
+    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-466'/>
+    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-464'/>
+    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-460'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-438'/>
+    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-866'/>
+    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-867'/>
+    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-445'/>
+    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-441'/>
+    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-559'/>
+    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-558'/>
+    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-560'/>
+    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-568'/>
+    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-576'/>
+    <pointer-type-def type-id='type-id-1268' size-in-bits='64' id='type-id-1269'/>
+    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-433'/>
+    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-1272'/>
+    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-611'/>
+    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-1274'/>
+    <qualified-type-def type-id='type-id-1274' const='yes' id='type-id-613'/>
+    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-626'/>
+    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-622'/>
+    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-625'/>
+    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-624'/>
+    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-737'/>
+    <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-736'/>
+    <pointer-type-def type-id='type-id-1281' size-in-bits='64' id='type-id-730'/>
+    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-739'/>
+    <pointer-type-def type-id='type-id-1283' size-in-bits='64' id='type-id-734'/>
+    <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-740'/>
+    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-735'/>
+    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-767'/>
+    <pointer-type-def type-id='type-id-1287' size-in-bits='64' id='type-id-1288'/>
+    <pointer-type-def type-id='type-id-1289' size-in-bits='64' id='type-id-331'/>
+    <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-342'/>
+    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-1294' size-in-bits='64' id='type-id-188'/>
+    <pointer-type-def type-id='type-id-1295' size-in-bits='64' id='type-id-488'/>
+    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-561'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-557'/>
+    <pointer-type-def type-id='type-id-1298' size-in-bits='64' id='type-id-570'/>
+    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-482'/>
+    <pointer-type-def type-id='type-id-1300' size-in-bits='64' id='type-id-876'/>
+    <pointer-type-def type-id='type-id-1301' size-in-bits='64' id='type-id-481'/>
+    <pointer-type-def type-id='type-id-1302' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-873'/>
+    <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-875'/>
+    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-861'/>
+    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-877'/>
+    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-493'/>
+    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-878'/>
+    <pointer-type-def type-id='type-id-1309' size-in-bits='64' id='type-id-874'/>
+    <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-345'/>
+    <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-1314' size-in-bits='64' id='type-id-664'/>
+    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-663'/>
+    <pointer-type-def type-id='type-id-1316' size-in-bits='64' id='type-id-668'/>
     <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-928'/>
     <pointer-type-def type-id='type-id-537' size-in-bits='64' id='type-id-533'/>
     <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-538'/>
-    <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-1314' size-in-bits='64' id='type-id-1315'/>
-    <pointer-type-def type-id='type-id-1316' size-in-bits='64' id='type-id-817'/>
-    <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-1319' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-1320' size-in-bits='64' id='type-id-1321'/>
+    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-817'/>
+    <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-287'/>
     <pointer-type-def type-id='type-id-796' size-in-bits='64' id='type-id-779'/>
-    <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-944'/>
-    <pointer-type-def type-id='type-id-1319' size-in-bits='64' id='type-id-555'/>
+    <pointer-type-def type-id='type-id-1324' size-in-bits='64' id='type-id-944'/>
+    <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-555'/>
     <pointer-type-def type-id='type-id-553' size-in-bits='64' id='type-id-547'/>
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-1320'/>
-    <pointer-type-def type-id='type-id-1321' size-in-bits='64' id='type-id-550'/>
+    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-1326'/>
+    <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-550'/>
     <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-545'/>
     <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-563'/>
     <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-214'/>
     <pointer-type-def type-id='type-id-585' size-in-bits='64' id='type-id-596'/>
     <pointer-type-def type-id='type-id-577' size-in-bits='64' id='type-id-582'/>
-    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-581'/>
-    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-590'/>
-    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-1323'/>
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-1324'/>
-    <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-703'/>
-    <pointer-type-def type-id='type-id-1326' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-581'/>
+    <pointer-type-def type-id='type-id-1328' size-in-bits='64' id='type-id-590'/>
+    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-1329'/>
+    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-1330'/>
+    <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-703'/>
+    <pointer-type-def type-id='type-id-1332' size-in-bits='64' id='type-id-536'/>
     <pointer-type-def type-id='type-id-602' size-in-bits='64' id='type-id-600'/>
-    <pointer-type-def type-id='type-id-609' size-in-bits='64' id='type-id-1327'/>
+    <pointer-type-def type-id='type-id-609' size-in-bits='64' id='type-id-1333'/>
     <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-268'/>
-    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-1328'/>
-    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-1329'/>
+    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-1334'/>
+    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-1335'/>
     <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-599'/>
-    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-1330'/>
-    <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-1332'/>
-    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-1333'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-1334'/>
-    <pointer-type-def type-id='type-id-630' size-in-bits='64' id='type-id-1335'/>
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-1336'/>
+    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
+    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-1339'/>
+    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-1340'/>
+    <pointer-type-def type-id='type-id-630' size-in-bits='64' id='type-id-1341'/>
     <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-628'/>
-    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-701'/>
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-1004'/>
     <pointer-type-def type-id='type-id-634' size-in-bits='64' id='type-id-636'/>
     <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-637'/>
     <pointer-type-def type-id='type-id-633' size-in-bits='64' id='type-id-63'/>
     <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-638'/>
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-1337'/>
-    <pointer-type-def type-id='type-id-1338' size-in-bits='64' id='type-id-449'/>
-    <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-436'/>
-    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-887'/>
-    <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-494'/>
-    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-1344' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-431'/>
+    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-449'/>
+    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-988'/>
+    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-447'/>
+    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-443'/>
+    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-451'/>
+    <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-436'/>
+    <pointer-type-def type-id='type-id-1353' size-in-bits='64' id='type-id-574'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-992'/>
+    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-764'/>
+    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-765'/>
+    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-446'/>
+    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-887'/>
+    <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-490'/>
+    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-491'/>
+    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-494'/>
+    <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-528'/>
+    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-430'/>
+    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-335'/>
+    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-316'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-311'/>
+    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-656'/>
     <pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-686'/>
     <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-751'/>
     <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-171'/>
     <pointer-type-def type-id='type-id-745' size-in-bits='64' id='type-id-752'/>
     <pointer-type-def type-id='type-id-721' size-in-bits='64' id='type-id-172'/>
     <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-1343'/>
-    <pointer-type-def type-id='type-id-1344' size-in-bits='64' id='type-id-748'/>
+    <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-1372'/>
+    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-748'/>
     <pointer-type-def type-id='type-id-724' size-in-bits='64' id='type-id-75'/>
-    <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-818'/>
+    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-818'/>
     <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-783'/>
     <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-263'/>
     <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-776'/>
-    <pointer-type-def type-id='type-id-759' size-in-bits='64' id='type-id-1346'/>
-    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-785'/>
-    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-760'/>
-    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-784'/>
-    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-420'/>
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-929'/>
-    <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-820'/>
-    <pointer-type-def type-id='type-id-1353' size-in-bits='64' id='type-id-808'/>
-    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-807'/>
+    <pointer-type-def type-id='type-id-759' size-in-bits='64' id='type-id-1375'/>
+    <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-785'/>
+    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-760'/>
+    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-784'/>
+    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-420'/>
+    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-929'/>
+    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-820'/>
+    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-808'/>
+    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-807'/>
     <pointer-type-def type-id='type-id-749' size-in-bits='64' id='type-id-812'/>
     <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-932'/>
     <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-895'/>
     <pointer-type-def type-id='type-id-671' size-in-bits='64' id='type-id-655'/>
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-670'/>
+    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-670'/>
     <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-1023'/>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-1356'/>
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-1385'/>
     <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-648'/>
-    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-828'/>
-    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-79'/>
-    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-828'/>
+    <pointer-type-def type-id='type-id-1387' size-in-bits='64' id='type-id-79'/>
+    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-81'/>
     <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-699'/>
     <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-83'/>
     <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-819'/>
-    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-376'/>
+    <pointer-type-def type-id='type-id-1389' size-in-bits='64' id='type-id-376'/>
     <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-136'/>
     <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-843'/>
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-653'/>
-    <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-1362'/>
-    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-896'/>
-    <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-361'/>
-    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-1391'/>
+    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-896'/>
+    <pointer-type-def type-id='type-id-1393' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-458'/>
     <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-823'/>
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-657'/>
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-654'/>
-    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-1366'/>
-    <pointer-type-def type-id='type-id-871' size-in-bits='64' id='type-id-1367'/>
-    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-1368'/>
-    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-1369'/>
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-865'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-1371'/>
+    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-1395'/>
+    <pointer-type-def type-id='type-id-871' size-in-bits='64' id='type-id-1396'/>
+    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-1397'/>
+    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-1398'/>
+    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-865'/>
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-1400'/>
     <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-857'/>
     <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-881'/>
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-926'/>
-    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-942'/>
-    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-744'/>
-    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-1401' size-in-bits='64' id='type-id-926'/>
+    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-942'/>
+    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-744'/>
+    <pointer-type-def type-id='type-id-1404' size-in-bits='64' id='type-id-358'/>
     <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-541'/>
-    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-1376'/>
+    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-1405'/>
     <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-1016'/>
-    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-947'/>
-    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-939'/>
-    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-914'/>
+    <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-1407' size-in-bits='64' id='type-id-939'/>
+    <pointer-type-def type-id='type-id-1408' size-in-bits='64' id='type-id-914'/>
     <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-722'/>
     <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
     <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-913'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-1380'/>
-    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-91'/>
-    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-719'/>
-    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-963'/>
-    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-1385'/>
-    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-565'/>
-    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-1387'/>
-    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-1388'/>
-    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-1389'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-1409'/>
+    <pointer-type-def type-id='type-id-1410' size-in-bits='64' id='type-id-91'/>
+    <pointer-type-def type-id='type-id-1411' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-1414'/>
+    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-565'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-1416'/>
+    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-1417'/>
+    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-1418'/>
     <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-934'/>
     <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-933'/>
-    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-1391'/>
+    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-1420'/>
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-658'/>
     <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-981'/>
     <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-95'/>
     <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-979'/>
     <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-787'/>
-    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-259'/>
+    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-259'/>
     <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-230'/>
-    <pointer-type-def type-id='type-id-1393' size-in-bits='64' id='type-id-1394'/>
-    <pointer-type-def type-id='type-id-1395' size-in-bits='64' id='type-id-923'/>
+    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-1423'/>
+    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-923'/>
     <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-694'/>
-    <pointer-type-def type-id='type-id-1396' size-in-bits='64' id='type-id-960'/>
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-1397'/>
+    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-960'/>
+    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-1426'/>
     <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-996'/>
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-1398'/>
-    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-1400'/>
-    <pointer-type-def type-id='type-id-1400' size-in-bits='64' id='type-id-790'/>
-    <pointer-type-def type-id='type-id-1401' size-in-bits='64' id='type-id-1402'/>
-    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-789'/>
+    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-1427'/>
+    <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-1429'/>
+    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-790'/>
+    <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-1431'/>
+    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-789'/>
     <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-1001'/>
     <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-999'/>
-    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-786'/>
-    <pointer-type-def type-id='type-id-1404' size-in-bits='64' id='type-id-961'/>
-    <pointer-type-def type-id='type-id-1405' size-in-bits='64' id='type-id-957'/>
-    <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-435'/>
-    <pointer-type-def type-id='type-id-1407' size-in-bits='64' id='type-id-575'/>
-    <pointer-type-def type-id='type-id-1408' size-in-bits='64' id='type-id-618'/>
-    <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-508'/>
-    <pointer-type-def type-id='type-id-1410' size-in-bits='64' id='type-id-510'/>
-    <pointer-type-def type-id='type-id-1411' size-in-bits='64' id='type-id-395'/>
-    <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-741'/>
-    <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-341'/>
-    <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-307'/>
-    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-311'/>
-    <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-392'/>
-    <pointer-type-def type-id='type-id-1417' size-in-bits='64' id='type-id-528'/>
-    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-452'/>
-    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-430'/>
-    <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-470'/>
-    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-431'/>
-    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-432'/>
-    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-988'/>
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-447'/>
-    <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-443'/>
-    <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-451'/>
-    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-574'/>
-    <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-339'/>
-    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-991'/>
-    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-992'/>
-    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-764'/>
-    <pointer-type-def type-id='type-id-1434' size-in-bits='64' id='type-id-765'/>
-    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-446'/>
-    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-490'/>
-    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-491'/>
-    <pointer-type-def type-id='type-id-1438' size-in-bits='64' id='type-id-182'/>
-    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-316'/>
-    <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-985'/>
-    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-986'/>
-    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-646'/>
-    <pointer-type-def type-id='type-id-1443' size-in-bits='64' id='type-id-665'/>
-    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-1444'/>
+    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-786'/>
+    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-961'/>
+    <pointer-type-def type-id='type-id-1434' size-in-bits='64' id='type-id-957'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-1435'/>
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-892'/>
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-833'/>
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-1446'/>
-    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-833'/>
+    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-1437'/>
+    <pointer-type-def type-id='type-id-1438' size-in-bits='64' id='type-id-435'/>
+    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-575'/>
+    <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-1443' size-in-bits='64' id='type-id-665'/>
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-805'/>
-    <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-444'/>
-    <pointer-type-def type-id='type-id-1449' size-in-bits='64' id='type-id-967'/>
-    <pointer-type-def type-id='type-id-1450' size-in-bits='64' id='type-id-667'/>
+    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-444'/>
+    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-667'/>
     <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-791'/>
-    <pointer-type-def type-id='type-id-1451' size-in-bits='64' id='type-id-1015'/>
+    <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-985'/>
+    <pointer-type-def type-id='type-id-1449' size-in-bits='64' id='type-id-986'/>
+    <pointer-type-def type-id='type-id-1450' size-in-bits='64' id='type-id-1015'/>
     <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-951'/>
-    <pointer-type-def type-id='type-id-1452' size-in-bits='64' id='type-id-216'/>
+    <pointer-type-def type-id='type-id-1451' size-in-bits='64' id='type-id-216'/>
     <pointer-type-def type-id='type-id-962' size-in-bits='64' id='type-id-215'/>
-    <pointer-type-def type-id='type-id-1453' size-in-bits='64' id='type-id-816'/>
-    <pointer-type-def type-id='type-id-1454' size-in-bits='64' id='type-id-827'/>
-    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-1452' size-in-bits='64' id='type-id-816'/>
+    <pointer-type-def type-id='type-id-1453' size-in-bits='64' id='type-id-827'/>
+    <pointer-type-def type-id='type-id-1454' size-in-bits='64' id='type-id-243'/>
     <pointer-type-def type-id='type-id-689' size-in-bits='64' id='type-id-125'/>
-    <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-1456'/>
+    <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-1455'/>
     <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-952'/>
-    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-792'/>
-    <pointer-type-def type-id='type-id-1458' size-in-bits='64' id='type-id-1007'/>
-    <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-270'/>
-    <pointer-type-def type-id='type-id-1460' size-in-bits='64' id='type-id-246'/>
-    <pointer-type-def type-id='type-id-1461' size-in-bits='64' id='type-id-240'/>
-    <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-645'/>
-    <pointer-type-def type-id='type-id-1464' size-in-bits='64' id='type-id-255'/>
-    <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-273'/>
-    <pointer-type-def type-id='type-id-1466' size-in-bits='64' id='type-id-313'/>
-    <pointer-type-def type-id='type-id-1467' size-in-bits='64' id='type-id-310'/>
-    <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-847'/>
-    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-1470' size-in-bits='64' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-844'/>
-    <pointer-type-def type-id='type-id-1472' size-in-bits='64' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-1473' size-in-bits='64' id='type-id-314'/>
-    <pointer-type-def type-id='type-id-1474' size-in-bits='64' id='type-id-864'/>
-    <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-346'/>
-    <pointer-type-def type-id='type-id-1476' size-in-bits='64' id='type-id-390'/>
-    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-389'/>
-    <pointer-type-def type-id='type-id-1478' size-in-bits='64' id='type-id-397'/>
-    <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-507'/>
-    <pointer-type-def type-id='type-id-1480' size-in-bits='64' id='type-id-375'/>
-    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-477'/>
-    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-569'/>
-    <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-326'/>
-    <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-603'/>
-    <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-608'/>
-    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-627'/>
-    <pointer-type-def type-id='type-id-1487' size-in-bits='64' id='type-id-621'/>
-    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-732'/>
-    <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-731'/>
-    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-733'/>
-    <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-729'/>
-    <pointer-type-def type-id='type-id-1492' size-in-bits='64' id='type-id-728'/>
-    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-727'/>
-    <pointer-type-def type-id='type-id-1494' size-in-bits='64' id='type-id-725'/>
-    <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-768'/>
-    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-766'/>
-    <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-338'/>
-    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-343'/>
-    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-1500' size-in-bits='64' id='type-id-189'/>
-    <pointer-type-def type-id='type-id-1501' size-in-bits='64' id='type-id-186'/>
-    <pointer-type-def type-id='type-id-1502' size-in-bits='64' id='type-id-185'/>
-    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-190'/>
-    <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-187'/>
-    <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-181'/>
-    <pointer-type-def type-id='type-id-1506' size-in-bits='64' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-1507' size-in-bits='64' id='type-id-191'/>
-    <pointer-type-def type-id='type-id-1508' size-in-bits='64' id='type-id-450'/>
-    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-573'/>
-    <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-480'/>
-    <pointer-type-def type-id='type-id-1511' size-in-bits='64' id='type-id-995'/>
-    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-393'/>
-    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-662'/>
-    <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-666'/>
-    <pointer-type-def type-id='type-id-1515' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-487'/>
-    <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-486'/>
-    <pointer-type-def type-id='type-id-1518' size-in-bits='64' id='type-id-1519'/>
-    <pointer-type-def type-id='type-id-1520' size-in-bits='64' id='type-id-127'/>
-    <pointer-type-def type-id='type-id-1521' size-in-bits='64' id='type-id-499'/>
-    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-509'/>
-    <pointer-type-def type-id='type-id-1523' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-303'/>
-    <pointer-type-def type-id='type-id-1525' size-in-bits='64' id='type-id-607'/>
-    <pointer-type-def type-id='type-id-1526' size-in-bits='64' id='type-id-571'/>
-    <pointer-type-def type-id='type-id-1527' size-in-bits='64' id='type-id-572'/>
-    <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-619'/>
+    <pointer-type-def type-id='type-id-1456' size-in-bits='64' id='type-id-792'/>
+    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-1007'/>
+    <pointer-type-def type-id='type-id-1458' size-in-bits='64' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-246'/>
+    <pointer-type-def type-id='type-id-1460' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-1461' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-645'/>
+    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-1464' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-1466' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-1467' size-in-bits='64' id='type-id-847'/>
+    <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-1470' size-in-bits='64' id='type-id-844'/>
+    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-1472' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-1473' size-in-bits='64' id='type-id-864'/>
+    <pointer-type-def type-id='type-id-1474' size-in-bits='64' id='type-id-346'/>
+    <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-390'/>
+    <pointer-type-def type-id='type-id-1476' size-in-bits='64' id='type-id-389'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-397'/>
+    <pointer-type-def type-id='type-id-1478' size-in-bits='64' id='type-id-507'/>
+    <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-375'/>
+    <pointer-type-def type-id='type-id-1480' size-in-bits='64' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-569'/>
+    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-603'/>
+    <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-608'/>
+    <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-627'/>
+    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-621'/>
+    <pointer-type-def type-id='type-id-1487' size-in-bits='64' id='type-id-732'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-731'/>
+    <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-733'/>
+    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-729'/>
+    <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-728'/>
+    <pointer-type-def type-id='type-id-1492' size-in-bits='64' id='type-id-727'/>
+    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-725'/>
+    <pointer-type-def type-id='type-id-1494' size-in-bits='64' id='type-id-768'/>
+    <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-766'/>
+    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-343'/>
+    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-1500' size-in-bits='64' id='type-id-186'/>
+    <pointer-type-def type-id='type-id-1501' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-1502' size-in-bits='64' id='type-id-190'/>
+    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-187'/>
+    <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-181'/>
+    <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-180'/>
+    <pointer-type-def type-id='type-id-1506' size-in-bits='64' id='type-id-191'/>
+    <pointer-type-def type-id='type-id-1507' size-in-bits='64' id='type-id-450'/>
+    <pointer-type-def type-id='type-id-1508' size-in-bits='64' id='type-id-573'/>
+    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-480'/>
+    <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-995'/>
+    <pointer-type-def type-id='type-id-1511' size-in-bits='64' id='type-id-393'/>
+    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-662'/>
+    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-1515' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-486'/>
+    <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-1518'/>
+    <pointer-type-def type-id='type-id-1519' size-in-bits='64' id='type-id-127'/>
+    <pointer-type-def type-id='type-id-1520' size-in-bits='64' id='type-id-499'/>
+    <pointer-type-def type-id='type-id-1521' size-in-bits='64' id='type-id-509'/>
+    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-272'/>
+    <pointer-type-def type-id='type-id-1523' size-in-bits='64' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-607'/>
+    <pointer-type-def type-id='type-id-1525' size-in-bits='64' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-1526' size-in-bits='64' id='type-id-572'/>
+    <pointer-type-def type-id='type-id-1527' size-in-bits='64' id='type-id-619'/>
+    <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-392'/>
     <pointer-type-def type-id='type-id-1529' size-in-bits='64' id='type-id-485'/>
     <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-1530'/>
     <qualified-type-def type-id='type-id-67' volatile='yes' id='type-id-921'/>
@@ -9706,97 +9706,97 @@
     <class-decl name='bdi_writeback' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1064'/>
     <class-decl name='bio_list' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1066'/>
     <class-decl name='blk_plug' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1067'/>
-    <class-decl name='capture_control' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1069'/>
-    <class-decl name='cdev' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1070'/>
-    <class-decl name='cfs_rq' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1071'/>
-    <class-decl name='cgroup_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1072'/>
-    <class-decl name='cma' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1076'/>
-    <class-decl name='compat_robust_list_head' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1077'/>
-    <class-decl name='css_set' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1155'/>
-    <class-decl name='dev_pin_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1160'/>
-    <class-decl name='dev_pm_qos' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1161'/>
-    <class-decl name='device_private' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1162'/>
-    <class-decl name='dma_coherent_mem' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1165'/>
-    <class-decl name='driver_private' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1170'/>
-    <class-decl name='export_operations' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1099'/>
-    <class-decl name='files_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1175'/>
-    <class-decl name='fs_context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1176'/>
-    <class-decl name='fs_parameter_description' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1103'/>
-    <class-decl name='fs_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1178'/>
-    <class-decl name='fscrypt_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1179'/>
-    <class-decl name='fscrypt_operations' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1105'/>
-    <class-decl name='fsnotify_mark_connector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1180'/>
-    <class-decl name='ftrace_ret_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1181'/>
-    <class-decl name='futex_pi_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1182'/>
-    <class-decl name='gendisk' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1189'/>
-    <class-decl name='hd_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1190'/>
-    <class-decl name='iommu_fwspec' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1311'/>
-    <class-decl name='iommu_group' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1312'/>
-    <class-decl name='iommu_ops' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1113'/>
-    <class-decl name='iommu_param' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1313'/>
-    <class-decl name='iov_iter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1314'/>
-    <class-decl name='ipc_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1316'/>
-    <class-decl name='irq_domain' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1317'/>
-    <class-decl name='kernfs_iattrs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1319'/>
-    <class-decl name='kernfs_open_node' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1321'/>
-    <class-decl name='key_type' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1122'/>
-    <class-decl name='key_user' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1322'/>
-    <class-decl name='kioctx_table' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1325'/>
-    <class-decl name='kmem_cache' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1326'/>
-    <class-decl name='kstatfs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1331'/>
-    <class-decl name='linux_binfmt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1336'/>
-    <class-decl name='mem_cgroup' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1342'/>
-    <class-decl name='mmc_bus_ops' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1131'/>
-    <class-decl name='mmc_pwrseq' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1344'/>
-    <class-decl name='mnt_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1345'/>
-    <class-decl name='module_notes_attrs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1347'/>
-    <class-decl name='module_param_attrs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1348'/>
-    <class-decl name='module_sect_attrs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1349'/>
-    <class-decl name='mtd_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1350'/>
-    <class-decl name='nameidata' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1351'/>
-    <class-decl name='net' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1352'/>
-    <class-decl name='nfs4_lock_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1353'/>
-    <class-decl name='nlm_lockowner' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1354'/>
-    <class-decl name='perf_event' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1358'/>
-    <class-decl name='perf_event_context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1359'/>
-    <class-decl name='pipe_inode_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1360'/>
-    <class-decl name='poll_table_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1361'/>
-    <class-decl name='pollfd' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1363'/>
-    <class-decl name='posix_acl' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1364'/>
-    <class-decl name='proc_ns_operations' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1138'/>
-    <class-decl name='rcu_node' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1372'/>
-    <class-decl name='reclaim_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1373'/>
-    <class-decl name='regulator' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1374'/>
-    <class-decl name='request_queue' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1375'/>
-    <class-decl name='robust_list_head' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1377'/>
-    <class-decl name='rt_mutex_waiter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1378'/>
-    <class-decl name='rt_rq' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1379'/>
-    <class-decl name='sched_class' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1145'/>
-    <class-decl name='sdio_func' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1381'/>
-    <class-decl name='sdio_func_tuple' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1382'/>
-    <class-decl name='seccomp_filter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1383'/>
-    <class-decl name='seq_file' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1386'/>
-    <class-decl name='sock' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1390'/>
-    <class-decl name='subsys_private' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1392'/>
-    <class-decl name='swap_info_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1393'/>
-    <class-decl name='task_group' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1395'/>
-    <class-decl name='taskstats' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1396'/>
-    <class-decl name='trace_eval_map' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1399'/>
-    <class-decl name='trace_event_call' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1401'/>
-    <class-decl name='tty_audit_buf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1404'/>
-    <class-decl name='tty_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1405'/>
-    <class-decl name='ucounts' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1445'/>
-    <class-decl name='uprobe' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1451'/>
-    <class-decl name='user_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1452'/>
-    <class-decl name='uts_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1453'/>
-    <class-decl name='vfsmount' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1454'/>
+    <class-decl name='capture_control' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1075'/>
+    <class-decl name='cdev' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1076'/>
+    <class-decl name='cfs_rq' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1077'/>
+    <class-decl name='cgroup_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1078'/>
+    <class-decl name='cma' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1082'/>
+    <class-decl name='compat_robust_list_head' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1083'/>
+    <class-decl name='css_set' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1161'/>
+    <class-decl name='dev_pin_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1166'/>
+    <class-decl name='dev_pm_qos' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1167'/>
+    <class-decl name='device_private' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1168'/>
+    <class-decl name='dma_coherent_mem' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1171'/>
+    <class-decl name='driver_private' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1176'/>
+    <class-decl name='export_operations' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1105'/>
+    <class-decl name='files_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1181'/>
+    <class-decl name='fs_context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1182'/>
+    <class-decl name='fs_parameter_description' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1109'/>
+    <class-decl name='fs_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1184'/>
+    <class-decl name='fscrypt_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1185'/>
+    <class-decl name='fscrypt_operations' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1111'/>
+    <class-decl name='fsnotify_mark_connector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1186'/>
+    <class-decl name='ftrace_ret_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1187'/>
+    <class-decl name='futex_pi_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1188'/>
+    <class-decl name='gendisk' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1195'/>
+    <class-decl name='hd_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1196'/>
+    <class-decl name='iommu_fwspec' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1317'/>
+    <class-decl name='iommu_group' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1318'/>
+    <class-decl name='iommu_ops' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1119'/>
+    <class-decl name='iommu_param' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1319'/>
+    <class-decl name='iov_iter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1320'/>
+    <class-decl name='ipc_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1322'/>
+    <class-decl name='irq_domain' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1323'/>
+    <class-decl name='kernfs_iattrs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1325'/>
+    <class-decl name='kernfs_open_node' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1327'/>
+    <class-decl name='key_type' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1128'/>
+    <class-decl name='key_user' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1328'/>
+    <class-decl name='kioctx_table' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1331'/>
+    <class-decl name='kmem_cache' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1332'/>
+    <class-decl name='kstatfs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1337'/>
+    <class-decl name='linux_binfmt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1342'/>
+    <class-decl name='mem_cgroup' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1371'/>
+    <class-decl name='mmc_bus_ops' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1137'/>
+    <class-decl name='mmc_pwrseq' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1373'/>
+    <class-decl name='mnt_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1374'/>
+    <class-decl name='module_notes_attrs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1376'/>
+    <class-decl name='module_param_attrs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1377'/>
+    <class-decl name='module_sect_attrs' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1378'/>
+    <class-decl name='mtd_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1379'/>
+    <class-decl name='nameidata' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1380'/>
+    <class-decl name='net' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1381'/>
+    <class-decl name='nfs4_lock_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1382'/>
+    <class-decl name='nlm_lockowner' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1383'/>
+    <class-decl name='perf_event' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1387'/>
+    <class-decl name='perf_event_context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1388'/>
+    <class-decl name='pipe_inode_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1389'/>
+    <class-decl name='poll_table_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1390'/>
+    <class-decl name='pollfd' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1392'/>
+    <class-decl name='posix_acl' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1393'/>
+    <class-decl name='proc_ns_operations' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1144'/>
+    <class-decl name='rcu_node' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1401'/>
+    <class-decl name='reclaim_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1402'/>
+    <class-decl name='regulator' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1403'/>
+    <class-decl name='request_queue' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1404'/>
+    <class-decl name='robust_list_head' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1406'/>
+    <class-decl name='rt_mutex_waiter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1407'/>
+    <class-decl name='rt_rq' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1408'/>
+    <class-decl name='sched_class' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1151'/>
+    <class-decl name='sdio_func' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1410'/>
+    <class-decl name='sdio_func_tuple' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1411'/>
+    <class-decl name='seccomp_filter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1412'/>
+    <class-decl name='seq_file' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1415'/>
+    <class-decl name='sock' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1419'/>
+    <class-decl name='subsys_private' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1421'/>
+    <class-decl name='swap_info_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1422'/>
+    <class-decl name='task_group' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1424'/>
+    <class-decl name='taskstats' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1425'/>
+    <class-decl name='trace_eval_map' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1428'/>
+    <class-decl name='trace_event_call' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1430'/>
+    <class-decl name='tty_audit_buf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1433'/>
+    <class-decl name='tty_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1434'/>
+    <class-decl name='ucounts' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1436'/>
+    <class-decl name='uprobe' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1450'/>
+    <class-decl name='user_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1451'/>
+    <class-decl name='uts_namespace' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1452'/>
+    <class-decl name='vfsmount' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1453'/>
     <class-decl name='wake_irq' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1531'/>
     <class-decl name='workqueue_struct' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1533'/>
     <class-decl name='writeback_control' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1534'/>
-    <class-decl name='xattr_handler' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1152'/>
+    <class-decl name='xattr_handler' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1158'/>
     <class-decl name='xol_area' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1536'/>
     <typedef-decl name='__uint128_t' type-id='type-id-110' id='type-id-14'/>
-    <type-decl name='void' id='type-id-1520'/>
+    <type-decl name='void' id='type-id-1519'/>
     <typedef-decl name='mm_context_t' type-id='type-id-132' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/mmu.h' line='23' column='1' id='type-id-131'/>
     <typedef-decl name='pgtable_t' type-id='type-id-655' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/page.h' line='27' column='1' id='type-id-659'/>
     <typedef-decl name='pteval_t' type-id='type-id-103' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h' line='14' column='1' id='type-id-141'/>
@@ -9808,105 +9808,105 @@
     <typedef-decl name='pgprot_t' type-id='type-id-149' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h' line='42' column='1' id='type-id-148'/>
     <typedef-decl name='mm_segment_t' type-id='type-id-114' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h' line='23' column='1' id='type-id-158'/>
     <function-decl name='sdhci_dumpregs' mangled-name='sdhci_dumpregs' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_dumpregs'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_enable_v4_mode' mangled-name='sdhci_enable_v4_mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_v4_mode'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_reset' mangled-name='sdhci_reset' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_reset'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
       <parameter type-id='type-id-105' name='mask' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_adma_write_desc' mangled-name='sdhci_adma_write_desc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_adma_write_desc'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
       <parameter type-id='type-id-1530' name='desc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
       <parameter type-id='type-id-164' name='addr' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='664' column='1'/>
       <parameter type-id='type-id-53' name='len' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='664' column='1'/>
       <parameter type-id='type-id-113' name='cmd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='664' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_send_command' mangled-name='sdhci_send_command' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_send_command'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
       <parameter type-id='type-id-171' name='cmd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_calc_clk' mangled-name='sdhci_calc_clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_calc_clk'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
       <parameter type-id='type-id-113' name='clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
       <parameter type-id='type-id-805' name='actual_clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1540' column='1'/>
       <return type-id='type-id-204'/>
     </function-decl>
     <function-decl name='sdhci_enable_clk' mangled-name='sdhci_enable_clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_clk'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
       <parameter type-id='type-id-204' name='clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_set_clock' mangled-name='sdhci_set_clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_clock'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
       <parameter type-id='type-id-113' name='clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_set_power_noreg' mangled-name='sdhci_set_power_noreg' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_power_noreg'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
       <parameter type-id='type-id-111' name='mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
       <parameter type-id='type-id-122' name='vdd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1691' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_set_power' mangled-name='sdhci_set_power' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_power'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
       <parameter type-id='type-id-111' name='mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
       <parameter type-id='type-id-122' name='vdd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1765' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_request' mangled-name='sdhci_request' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1780' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_request'>
       <parameter type-id='type-id-166' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1780' column='1'/>
       <parameter type-id='type-id-75' name='mrq' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1780' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_set_bus_width' mangled-name='sdhci_set_bus_width' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_bus_width'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
       <parameter type-id='type-id-53' name='width' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_set_uhs_signaling' mangled-name='sdhci_set_uhs_signaling' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_uhs_signaling'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
       <parameter type-id='type-id-113' name='timing' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_set_ios' mangled-name='sdhci_set_ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_ios'>
       <parameter type-id='type-id-166' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
-      <parameter type-id='type-id-1343' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1372' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_enable_sdio_irq' mangled-name='sdhci_enable_sdio_irq' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_sdio_irq'>
       <parameter type-id='type-id-166' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2114' column='1'/>
       <parameter type-id='type-id-53' name='enable' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2114' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_start_signal_voltage_switch' mangled-name='sdhci_start_signal_voltage_switch' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_start_signal_voltage_switch'>
       <parameter type-id='type-id-166' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2147' column='1'/>
-      <parameter type-id='type-id-1343' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2148' column='1'/>
+      <parameter type-id='type-id-1372' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2148' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_start_tuning' mangled-name='sdhci_start_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_start_tuning'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_end_tuning' mangled-name='sdhci_end_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_end_tuning'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_reset_tuning' mangled-name='sdhci_reset_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_reset_tuning'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_send_tuning' mangled-name='sdhci_send_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_send_tuning'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
       <parameter type-id='type-id-99' name='opcode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_execute_tuning' mangled-name='sdhci_execute_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_execute_tuning'>
       <parameter type-id='type-id-166' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2417' column='1'/>
@@ -9914,33 +9914,33 @@
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_suspend_host' mangled-name='sdhci_suspend_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_suspend_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_resume_host' mangled-name='sdhci_resume_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_resume_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_runtime_suspend_host' mangled-name='sdhci_runtime_suspend_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_runtime_suspend_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_runtime_resume_host' mangled-name='sdhci_runtime_resume_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_runtime_resume_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
       <parameter type-id='type-id-53' name='soft_reset' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_cqe_enable' mangled-name='sdhci_cqe_enable' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cqe_enable'>
       <parameter type-id='type-id-166' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3381' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_cqe_disable' mangled-name='sdhci_cqe_disable' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3425' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cqe_disable'>
       <parameter type-id='type-id-166' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3425' column='1'/>
       <parameter type-id='type-id-170' name='recovery' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3425' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_cqe_irq' mangled-name='sdhci_cqe_irq' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cqe_irq'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-99' name='intmask' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-928' name='cmd_error' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-928' name='data_error' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3450' column='1'/>
@@ -9949,39 +9949,39 @@
     <function-decl name='sdhci_alloc_host' mangled-name='sdhci_alloc_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_alloc_host'>
       <parameter type-id='type-id-250' name='dev' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3499' column='1'/>
       <parameter type-id='type-id-174' name='priv_size' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3500' column='1'/>
-      <return type-id='type-id-1380'/>
+      <return type-id='type-id-1409'/>
     </function-decl>
     <function-decl name='__sdhci_read_caps' mangled-name='__sdhci_read_caps' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sdhci_read_caps'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
-      <parameter type-id='type-id-1444' name='ver' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
+      <parameter type-id='type-id-1435' name='ver' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
       <parameter type-id='type-id-892' name='caps' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
       <parameter type-id='type-id-892' name='caps1' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_setup_host' mangled-name='sdhci_setup_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_setup_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_cleanup_host' mangled-name='sdhci_cleanup_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cleanup_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='__sdhci_add_host' mangled-name='__sdhci_add_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sdhci_add_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_add_host' mangled-name='sdhci_add_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_add_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1'/>
       <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='sdhci_remove_host' mangled-name='sdhci_remove_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_remove_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
       <parameter type-id='type-id-53' name='dead' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <function-decl name='sdhci_free_host' mangled-name='sdhci_free_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_free_host'>
-      <parameter type-id='type-id-1380' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1409' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1'/>
+      <return type-id='type-id-1519'/>
     </function-decl>
     <typedef-decl name='atomic_long_t' type-id='type-id-133' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/atomic-long.h' line='12' column='1' id='type-id-17'/>
     <typedef-decl name='s8' type-id='type-id-1537' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/int-ll64.h' line='16' column='1' id='type-id-799'/>
@@ -9998,19 +9998,19 @@
     <typedef-decl name='cpumask_t' type-id='type-id-209' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cpumask.h' line='16' column='1' id='type-id-925'/>
     <typedef-decl name='errseq_t' type-id='type-id-99' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/errseq.h' line='8' column='1' id='type-id-353'/>
     <typedef-decl name='fl_owner_t' type-id='type-id-127' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1012' column='1' id='type-id-400'/>
-    <typedef-decl name='filldir_t' type-id='type-id-1223' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1743' column='1' id='type-id-428'/>
+    <typedef-decl name='filldir_t' type-id='type-id-1229' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1743' column='1' id='type-id-428'/>
     <typedef-decl name='key_serial_t' type-id='type-id-1541' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='28' column='1' id='type-id-588'/>
     <typedef-decl name='key_perm_t' type-id='type-id-983' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='31' column='1' id='type-id-593'/>
-    <typedef-decl name='key_restrict_link_func_t' type-id='type-id-1263' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='148' column='1' id='type-id-586'/>
+    <typedef-decl name='key_restrict_link_func_t' type-id='type-id-1269' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='148' column='1' id='type-id-586'/>
     <typedef-decl name='ktime_t' type-id='type-id-869' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ktime.h' line='28' column='1' id='type-id-521'/>
     <typedef-decl name='vm_fault_t' type-id='type-id-113' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='649' column='1' id='type-id-1542'/>
     <typedef-decl name='mmc_pm_flag_t' type-id='type-id-113' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mmc/pm.h' line='22' column='1' id='type-id-750'/>
     <typedef-decl name='isolate_mode_t' type-id='type-id-113' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mmzone.h' line='317' column='1' id='type-id-1543'/>
     <typedef-decl name='kernel_ulong_t' type-id='type-id-114' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mod_devicetable.h' line='14' column='1' id='type-id-757'/>
     <typedef-decl name='nodemask_t' type-id='type-id-810' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nodemask.h' line='98' column='1' id='type-id-809'/>
-    <typedef-decl name='notifier_fn_t' type-id='type-id-1282' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/notifier.h' line='51' column='1' id='type-id-811'/>
+    <typedef-decl name='notifier_fn_t' type-id='type-id-1288' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/notifier.h' line='51' column='1' id='type-id-811'/>
     <typedef-decl name='phandle' type-id='type-id-99' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/of.h' line='28' column='1' id='type-id-826'/>
-    <typedef-decl name='percpu_ref_func_t' type-id='type-id-1544' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/percpu-refcount.h' line='60' column='1' id='type-id-1357'/>
+    <typedef-decl name='percpu_ref_func_t' type-id='type-id-1544' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/percpu-refcount.h' line='60' column='1' id='type-id-1386'/>
     <typedef-decl name='pm_message_t' type-id='type-id-835' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h' line='52' column='1' id='type-id-840'/>
     <typedef-decl name='projid_t' type-id='type-id-1036' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/projid.h' line='20' column='1' id='type-id-851'/>
     <typedef-decl name='kprojid_t' type-id='type-id-850' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/projid.h' line='24' column='1' id='type-id-849'/>
@@ -10019,12 +10019,12 @@
     <typedef-decl name='rwlock_t' type-id='type-id-897' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwlock_types.h' line='20' column='1' id='type-id-379'/>
     <typedef-decl name='seqcount_t' type-id='type-id-964' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seqlock.h' line='53' column='1' id='type-id-225'/>
     <typedef-decl name='seqlock_t' type-id='type-id-965' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seqlock.h' line='407' column='1' id='type-id-959'/>
-    <typedef-decl name='kernel_siginfo_t' type-id='type-id-969' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h' line='14' column='1' id='type-id-1318'/>
+    <typedef-decl name='kernel_siginfo_t' type-id='type-id-969' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h' line='14' column='1' id='type-id-1324'/>
     <typedef-decl name='raw_spinlock_t' type-id='type-id-975' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/spinlock_types.h' line='29' column='1' id='type-id-530'/>
     <typedef-decl name='spinlock_t' type-id='type-id-976' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/spinlock_types.h' line='73' column='1' id='type-id-169'/>
     <typedef-decl name='old_time32_t' type-id='type-id-723' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time32.h' line='17' column='1' id='type-id-994'/>
     <typedef-decl name='time64_t' type-id='type-id-1540' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time64.h' line='7' column='1' id='type-id-592'/>
-    <typedef-decl name='tracepoint_ptr_t' type-id='type-id-1112' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/tracepoint-defs.h' line='39' column='1' id='type-id-1403'/>
+    <typedef-decl name='tracepoint_ptr_t' type-id='type-id-1118' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/tracepoint-defs.h' line='39' column='1' id='type-id-1432'/>
     <typedef-decl name='__kernel_dev_t' type-id='type-id-99' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='13' column='1' id='type-id-1545'/>
     <typedef-decl name='dev_t' type-id='type-id-1545' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='16' column='1' id='type-id-296'/>
     <typedef-decl name='umode_t' type-id='type-id-122' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='19' column='1' id='type-id-320'/>
@@ -10038,7 +10038,7 @@
     <typedef-decl name='ssize_t' type-id='type-id-1550' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='60' column='1' id='type-id-1551'/>
     <typedef-decl name='int32_t' type-id='type-id-723' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='103' column='1' id='type-id-1541'/>
     <typedef-decl name='uint32_t' type-id='type-id-99' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='109' column='1' id='type-id-983'/>
-    <typedef-decl name='sector_t' type-id='type-id-103' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='130' column='1' id='type-id-1384'/>
+    <typedef-decl name='sector_t' type-id='type-id-103' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='130' column='1' id='type-id-1413'/>
     <typedef-decl name='blkcnt_t' type-id='type-id-103' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='131' column='1' id='type-id-365'/>
     <typedef-decl name='dma_addr_t' type-id='type-id-103' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='148' column='1' id='type-id-164'/>
     <typedef-decl name='gfp_t' type-id='type-id-113' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='153' column='1' id='type-id-349'/>
@@ -10051,7 +10051,7 @@
     <typedef-decl name='kgid_t' type-id='type-id-1010' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h' line='28' column='1' id='type-id-58'/>
     <typedef-decl name='uuid_t' type-id='type-id-1021' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uuid.h' line='18' column='1' id='type-id-422'/>
     <typedef-decl name='wait_queue_head_t' type-id='type-id-1025' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/wait.h' line='38' column='1' id='type-id-178'/>
-    <typedef-decl name='work_func_t' type-id='type-id-1519' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/workqueue.h' line='21' column='1' id='type-id-1026'/>
+    <typedef-decl name='work_func_t' type-id='type-id-1518' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/workqueue.h' line='21' column='1' id='type-id-1026'/>
     <typedef-decl name='__s8' type-id='type-id-94' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/int-ll64.h' line='20' column='1' id='type-id-1537'/>
     <typedef-decl name='__u8' type-id='type-id-111' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/int-ll64.h' line='21' column='1' id='type-id-9'/>
     <typedef-decl name='__u16' type-id='type-id-122' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/int-ll64.h' line='24' column='1' id='type-id-1538'/>
@@ -10074,7 +10074,7 @@
     <typedef-decl name='sigval_t' type-id='type-id-1027' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='11' column='1' id='type-id-1038'/>
     <typedef-decl name='__signalfn_t' type-id='type-id-1553' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h' line='18' column='1' id='type-id-1056'/>
     <typedef-decl name='__sighandler_t' type-id='type-id-1057' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h' line='19' column='1' id='type-id-973'/>
-    <typedef-decl name='__restorefn_t' type-id='type-id-1457' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h' line='21' column='1' id='type-id-1054'/>
+    <typedef-decl name='__restorefn_t' type-id='type-id-1456' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h' line='21' column='1' id='type-id-1054'/>
     <typedef-decl name='__sigrestore_t' type-id='type-id-1055' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h' line='22' column='1' id='type-id-974'/>
     <typedef-decl name='sigset_t' type-id='type-id-1043' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal.h' line='92' column='1' id='type-id-935'/>
     <typedef-decl name='Elf64_Addr' type-id='type-id-7' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/elf.h' line='16' column='1' id='type-id-1047'/>
@@ -10084,163 +10084,190 @@
     <typedef-decl name='Elf64_Sym' type-id='type-id-1044' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/elf.h' line='199' column='1' id='type-id-1053'/>
     <typedef-decl name='__le32' type-id='type-id-2' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/types.h' line='31' column='1' id='type-id-138'/>
     <typedef-decl name='__poll_t' type-id='type-id-113' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/types.h' line='52' column='1' id='type-id-1554'/>
+    <function-type size-in-bits='64' id='type-id-1068'>
+      <return type-id='type-id-170'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1069'>
+      <parameter type-id='type-id-503'/>
+      <return type-id='type-id-170'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1070'>
+      <parameter type-id='type-id-503'/>
+      <parameter type-id='type-id-163'/>
+      <return type-id='type-id-170'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1071'>
+      <parameter type-id='type-id-399'/>
+      <return type-id='type-id-170'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1072'>
+      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-75'/>
+      <parameter type-id='type-id-1074'/>
+      <return type-id='type-id-170'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1073'>
+      <parameter type-id='type-id-655'/>
+      <parameter type-id='type-id-1543'/>
+      <return type-id='type-id-170'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1079'>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1074'>
+    <function-type size-in-bits='64' id='type-id-1080'>
       <parameter type-id='type-id-250'/>
-      <parameter type-id='type-id-1446'/>
+      <parameter type-id='type-id-1437'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1075'>
+    <function-type size-in-bits='64' id='type-id-1081'>
       <parameter type-id='type-id-250'/>
-      <parameter type-id='type-id-1446'/>
-      <parameter type-id='type-id-1333'/>
-      <parameter type-id='type-id-1323'/>
+      <parameter type-id='type-id-1437'/>
+      <parameter type-id='type-id-1339'/>
+      <parameter type-id='type-id-1329'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1083'>
+    <function-type size-in-bits='64' id='type-id-1089'>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-51'/>
-      <parameter type-id='type-id-1156'/>
+      <parameter type-id='type-id-1162'/>
       <return type-id='type-id-163'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1084'>
+    <function-type size-in-bits='64' id='type-id-1090'>
       <parameter type-id='type-id-599'/>
       <parameter type-id='type-id-268'/>
       <return type-id='type-id-163'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1086'>
+    <function-type size-in-bits='64' id='type-id-1092'>
       <parameter type-id='type-id-125'/>
       <return type-id='type-id-163'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1126'>
+    <function-type size-in-bits='64' id='type-id-1132'>
       <parameter type-id='type-id-268'/>
       <return type-id='type-id-271'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1157'>
+    <function-type size-in-bits='64' id='type-id-1163'>
       <parameter type-id='type-id-227'/>
-      <parameter type-id='type-id-1110'/>
+      <parameter type-id='type-id-1116'/>
       <return type-id='type-id-227'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1158'>
+    <function-type size-in-bits='64' id='type-id-1164'>
       <parameter type-id='type-id-412'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-127'/>
       <return type-id='type-id-227'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1159'>
+    <function-type size-in-bits='64' id='type-id-1165'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-227'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1167'>
+    <function-type size-in-bits='64' id='type-id-1173'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-53'/>
-      <return type-id='type-id-1166'/>
+      <return type-id='type-id-1172'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1169'>
+    <function-type size-in-bits='64' id='type-id-1175'>
       <parameter type-id='type-id-51'/>
-      <return type-id='type-id-1168'/>
+      <return type-id='type-id-1174'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1171'>
+    <function-type size-in-bits='64' id='type-id-1177'>
       <parameter type-id='type-id-526'/>
       <return type-id='type-id-518'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1172'>
-      <parameter type-id='type-id-1334'/>
+    <function-type size-in-bits='64' id='type-id-1178'>
+      <parameter type-id='type-id-1340'/>
       <return type-id='type-id-620'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1184'>
+    <function-type size-in-bits='64' id='type-id-1190'>
       <parameter type-id='type-id-503'/>
       <return type-id='type-id-295'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1185'>
+    <function-type size-in-bits='64' id='type-id-1191'>
       <parameter type-id='type-id-503'/>
       <parameter type-id='type-id-163'/>
       <return type-id='type-id-295'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1186'>
+    <function-type size-in-bits='64' id='type-id-1192'>
       <parameter type-id='type-id-503'/>
       <parameter type-id='type-id-295'/>
       <return type-id='type-id-295'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1187'>
+    <function-type size-in-bits='64' id='type-id-1193'>
       <parameter type-id='type-id-295'/>
       <return type-id='type-id-295'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1192'>
+    <function-type size-in-bits='64' id='type-id-1198'>
       <parameter type-id='type-id-230'/>
       <return type-id='type-id-51'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1193'>
+    <function-type size-in-bits='64' id='type-id-1199'>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1194'>
+    <function-type size-in-bits='64' id='type-id-1200'>
       <parameter type-id='type-id-363'/>
       <parameter type-id='type-id-655'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1195'>
+    <function-type size-in-bits='64' id='type-id-1201'>
       <parameter type-id='type-id-363'/>
       <parameter type-id='type-id-655'/>
       <parameter type-id='type-id-655'/>
       <parameter type-id='type-id-651'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1196'>
+    <function-type size-in-bits='64' id='type-id-1202'>
       <parameter type-id='type-id-363'/>
       <parameter type-id='type-id-1535'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1197'>
+    <function-type size-in-bits='64' id='type-id-1203'>
       <parameter type-id='type-id-24'/>
-      <parameter type-id='type-id-1116'/>
+      <parameter type-id='type-id-1122'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1198'>
+    <function-type size-in-bits='64' id='type-id-1204'>
       <parameter type-id='type-id-163'/>
-      <parameter type-id='type-id-1116'/>
+      <parameter type-id='type-id-1122'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1199'>
-      <parameter type-id='type-id-1090'/>
+    <function-type size-in-bits='64' id='type-id-1205'>
+      <parameter type-id='type-id-1096'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1200'>
-      <parameter type-id='type-id-1090'/>
-      <parameter type-id='type-id-1371'/>
+    <function-type size-in-bits='64' id='type-id-1206'>
+      <parameter type-id='type-id-1096'/>
+      <parameter type-id='type-id-1400'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1201'>
-      <parameter type-id='type-id-1090'/>
+    <function-type size-in-bits='64' id='type-id-1207'>
+      <parameter type-id='type-id-1096'/>
       <parameter type-id='type-id-113'/>
       <parameter type-id='type-id-163'/>
-      <parameter type-id='type-id-1141'/>
+      <parameter type-id='type-id-1147'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1202'>
+    <function-type size-in-bits='64' id='type-id-1208'>
       <parameter type-id='type-id-503'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-718'/>
       <parameter type-id='type-id-174'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1203'>
+    <function-type size-in-bits='64' id='type-id-1209'>
       <parameter type-id='type-id-503'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-113'/>
       <parameter type-id='type-id-113'/>
-      <parameter type-id='type-id-1188'/>
+      <parameter type-id='type-id-1194'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1204'>
+    <function-type size-in-bits='64' id='type-id-1210'>
       <parameter type-id='type-id-503'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-113'/>
@@ -10248,69 +10275,69 @@
       <parameter type-id='type-id-174'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1205'>
+    <function-type size-in-bits='64' id='type-id-1211'>
       <parameter type-id='type-id-503'/>
-      <parameter type-id='type-id-1183'/>
+      <parameter type-id='type-id-1189'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1206'>
-      <parameter type-id='type-id-1137'/>
-      <parameter type-id='type-id-1330'/>
+    <function-type size-in-bits='64' id='type-id-1212'>
+      <parameter type-id='type-id-1143'/>
+      <parameter type-id='type-id-1336'/>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1207'>
-      <parameter type-id='type-id-1137'/>
+    <function-type size-in-bits='64' id='type-id-1213'>
+      <parameter type-id='type-id-1143'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1208'>
+    <function-type size-in-bits='64' id='type-id-1214'>
       <parameter type-id='type-id-227'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1209'>
+    <function-type size-in-bits='64' id='type-id-1215'>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1210'>
+    <function-type size-in-bits='64' id='type-id-1216'>
       <parameter type-id='type-id-227'/>
-      <parameter type-id='type-id-1191'/>
+      <parameter type-id='type-id-1197'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1211'>
+    <function-type size-in-bits='64' id='type-id-1217'>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1212'>
+    <function-type size-in-bits='64' id='type-id-1218'>
       <parameter type-id='type-id-227'/>
-      <parameter type-id='type-id-1332'/>
+      <parameter type-id='type-id-1338'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1213'>
+    <function-type size-in-bits='64' id='type-id-1219'>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1214'>
+    <function-type size-in-bits='64' id='type-id-1220'>
       <parameter type-id='type-id-250'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1215'>
+    <function-type size-in-bits='64' id='type-id-1221'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-283'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1216'>
+    <function-type size-in-bits='64' id='type-id-1222'>
       <parameter type-id='type-id-250'/>
-      <parameter type-id='type-id-1327'/>
+      <parameter type-id='type-id-1333'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1217'>
+    <function-type size-in-bits='64' id='type-id-1223'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-722'/>
       <parameter type-id='type-id-53'/>
@@ -10318,26 +10345,26 @@
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1218'>
+    <function-type size-in-bits='64' id='type-id-1224'>
       <parameter type-id='type-id-250'/>
-      <parameter type-id='type-id-1387'/>
+      <parameter type-id='type-id-1416'/>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1219'>
+    <function-type size-in-bits='64' id='type-id-1225'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-840'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1220'>
+    <function-type size-in-bits='64' id='type-id-1226'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-103'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1221'>
+    <function-type size-in-bits='64' id='type-id-1227'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-127'/>
@@ -10346,8 +10373,8 @@
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1222'>
-      <parameter type-id='type-id-1163'/>
+    <function-type size-in-bits='64' id='type-id-1228'>
+      <parameter type-id='type-id-1169'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-321'/>
@@ -10355,18 +10382,18 @@
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1224'>
-      <parameter type-id='type-id-1166'/>
+    <function-type size-in-bits='64' id='type-id-1230'>
+      <parameter type-id='type-id-1172'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1225'>
+    <function-type size-in-bits='64' id='type-id-1231'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-363'/>
       <parameter type-id='type-id-1004'/>
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1226'>
+    <function-type size-in-bits='64' id='type-id-1232'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-363'/>
       <parameter type-id='type-id-321'/>
@@ -10376,7 +10403,7 @@
       <parameter type-id='type-id-1530'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1227'>
+    <function-type size-in-bits='64' id='type-id-1233'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-363'/>
       <parameter type-id='type-id-321'/>
@@ -10386,84 +10413,84 @@
       <parameter type-id='type-id-127'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1228'>
+    <function-type size-in-bits='64' id='type-id-1234'>
       <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-1163'/>
+      <parameter type-id='type-id-1169'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1229'>
+    <function-type size-in-bits='64' id='type-id-1235'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-399'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1230'>
+    <function-type size-in-bits='64' id='type-id-1236'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-268'/>
       <parameter type-id='type-id-1065'/>
       <parameter type-id='type-id-125'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1231'>
+    <function-type size-in-bits='64' id='type-id-1237'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-67'/>
-      <parameter type-id='type-id-1174'/>
+      <parameter type-id='type-id-1180'/>
       <parameter type-id='type-id-1530'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1232'>
+    <function-type size-in-bits='64' id='type-id-1238'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-655'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1233'>
+    <function-type size-in-bits='64' id='type-id-1239'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-400'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1234'>
+    <function-type size-in-bits='64' id='type-id-1240'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-321'/>
       <parameter type-id='type-id-321'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1235'>
+    <function-type size-in-bits='64' id='type-id-1241'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-125'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1236'>
+    <function-type size-in-bits='64' id='type-id-1242'>
       <parameter type-id='type-id-399'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1237'>
+    <function-type size-in-bits='64' id='type-id-1243'>
       <parameter type-id='type-id-399'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-1004'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1238'>
-      <parameter type-id='type-id-1177'/>
+    <function-type size-in-bits='64' id='type-id-1244'>
+      <parameter type-id='type-id-1183'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1239'>
+    <function-type size-in-bits='64' id='type-id-1245'>
       <parameter type-id='type-id-51'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1240'>
+    <function-type size-in-bits='64' id='type-id-1246'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1241'>
+    <function-type size-in-bits='64' id='type-id-1247'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-163'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1242'>
+    <function-type size-in-bits='64' id='type-id-1248'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-323'/>
@@ -10471,7 +10498,7 @@
       <parameter type-id='type-id-320'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1243'>
+    <function-type size-in-bits='64' id='type-id-1249'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-51'/>
@@ -10479,157 +10506,157 @@
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1244'>
+    <function-type size-in-bits='64' id='type-id-1250'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-320'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1245'>
+    <function-type size-in-bits='64' id='type-id-1251'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-320'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1246'>
+    <function-type size-in-bits='64' id='type-id-1252'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-320'/>
       <parameter type-id='type-id-296'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1247'>
+    <function-type size-in-bits='64' id='type-id-1253'>
       <parameter type-id='type-id-51'/>
-      <parameter type-id='type-id-1173'/>
+      <parameter type-id='type-id-1179'/>
       <parameter type-id='type-id-103'/>
       <parameter type-id='type-id-103'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1248'>
+    <function-type size-in-bits='64' id='type-id-1254'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-323'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1249'>
+    <function-type size-in-bits='64' id='type-id-1255'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1250'>
+    <function-type size-in-bits='64' id='type-id-1256'>
       <parameter type-id='type-id-51'/>
-      <parameter type-id='type-id-1328'/>
+      <parameter type-id='type-id-1334'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1251'>
+    <function-type size-in-bits='64' id='type-id-1257'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-361'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1252'>
+    <function-type size-in-bits='64' id='type-id-1258'>
       <parameter type-id='type-id-51'/>
-      <parameter type-id='type-id-1369'/>
+      <parameter type-id='type-id-1398'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1253'>
+    <function-type size-in-bits='64' id='type-id-1259'>
       <parameter type-id='type-id-51'/>
-      <parameter type-id='type-id-1398'/>
+      <parameter type-id='type-id-1427'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1254'>
+    <function-type size-in-bits='64' id='type-id-1260'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-1535'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1255'>
+    <function-type size-in-bits='64' id='type-id-1261'>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1256'>
+    <function-type size-in-bits='64' id='type-id-1262'>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1257'>
+    <function-type size-in-bits='64' id='type-id-1263'>
       <parameter type-id='type-id-547'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1258'>
+    <function-type size-in-bits='64' id='type-id-1264'>
       <parameter type-id='type-id-547'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-320'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1259'>
+    <function-type size-in-bits='64' id='type-id-1265'>
       <parameter type-id='type-id-547'/>
       <parameter type-id='type-id-547'/>
       <parameter type-id='type-id-163'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1260'>
-      <parameter type-id='type-id-1320'/>
+    <function-type size-in-bits='64' id='type-id-1266'>
+      <parameter type-id='type-id-1326'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1261'>
-      <parameter type-id='type-id-1320'/>
+    <function-type size-in-bits='64' id='type-id-1267'>
+      <parameter type-id='type-id-1326'/>
       <parameter type-id='type-id-125'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1262'>
+    <function-type size-in-bits='64' id='type-id-1268'>
       <parameter type-id='type-id-214'/>
-      <parameter type-id='type-id-1124'/>
-      <parameter type-id='type-id-1121'/>
+      <parameter type-id='type-id-1130'/>
+      <parameter type-id='type-id-1127'/>
       <parameter type-id='type-id-214'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1264'>
-      <parameter type-id='type-id-1324'/>
+    <function-type size-in-bits='64' id='type-id-1270'>
+      <parameter type-id='type-id-1330'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1265'>
+    <function-type size-in-bits='64' id='type-id-1271'>
       <parameter type-id='type-id-599'/>
       <parameter type-id='type-id-268'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1267'>
+    <function-type size-in-bits='64' id='type-id-1273'>
       <parameter type-id='type-id-599'/>
       <parameter type-id='type-id-268'/>
-      <parameter type-id='type-id-1327'/>
+      <parameter type-id='type-id-1333'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1269'>
-      <parameter type-id='type-id-1334'/>
+    <function-type size-in-bits='64' id='type-id-1275'>
+      <parameter type-id='type-id-1340'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1270'>
-      <parameter type-id='type-id-1334'/>
+    <function-type size-in-bits='64' id='type-id-1276'>
+      <parameter type-id='type-id-1340'/>
       <parameter type-id='type-id-620'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1271'>
-      <parameter type-id='type-id-1334'/>
-      <parameter type-id='type-id-1335'/>
+    <function-type size-in-bits='64' id='type-id-1277'>
+      <parameter type-id='type-id-1340'/>
+      <parameter type-id='type-id-1341'/>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1272'>
-      <parameter type-id='type-id-1334'/>
+    <function-type size-in-bits='64' id='type-id-1278'>
+      <parameter type-id='type-id-1340'/>
       <parameter type-id='type-id-791'/>
       <parameter type-id='type-id-791'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1273'>
+    <function-type size-in-bits='64' id='type-id-1279'>
       <parameter type-id='type-id-751'/>
       <parameter type-id='type-id-113'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1274'>
+    <function-type size-in-bits='64' id='type-id-1280'>
       <parameter type-id='type-id-751'/>
       <parameter type-id='type-id-113'/>
       <parameter type-id='type-id-53'/>
@@ -10637,185 +10664,185 @@
       <parameter type-id='type-id-928'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1275'>
+    <function-type size-in-bits='64' id='type-id-1281'>
       <parameter type-id='type-id-166'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1276'>
+    <function-type size-in-bits='64' id='type-id-1282'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-751'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1277'>
+    <function-type size-in-bits='64' id='type-id-1283'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1343'/>
+      <parameter type-id='type-id-1372'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1278'>
+    <function-type size-in-bits='64' id='type-id-1284'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-75'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1279'>
+    <function-type size-in-bits='64' id='type-id-1285'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1280'>
+    <function-type size-in-bits='64' id='type-id-1286'>
       <parameter type-id='type-id-263'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1281'>
+    <function-type size-in-bits='64' id='type-id-1287'>
       <parameter type-id='type-id-812'/>
       <parameter type-id='type-id-114'/>
       <parameter type-id='type-id-127'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1283'>
+    <function-type size-in-bits='64' id='type-id-1289'>
       <parameter type-id='type-id-655'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1284'>
+    <function-type size-in-bits='64' id='type-id-1290'>
       <parameter type-id='type-id-655'/>
       <parameter type-id='type-id-349'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1285'>
+    <function-type size-in-bits='64' id='type-id-1291'>
       <parameter type-id='type-id-655'/>
       <parameter type-id='type-id-114'/>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1286'>
+    <function-type size-in-bits='64' id='type-id-1292'>
       <parameter type-id='type-id-655'/>
       <parameter type-id='type-id-1535'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1287'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1293'>
+      <parameter type-id='type-id-1409'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1288'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1294'>
+      <parameter type-id='type-id-1409'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1289'>
+    <function-type size-in-bits='64' id='type-id-1295'>
       <parameter type-id='type-id-565'/>
       <parameter type-id='type-id-227'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1290'>
+    <function-type size-in-bits='64' id='type-id-1296'>
       <parameter type-id='type-id-565'/>
       <parameter type-id='type-id-547'/>
       <parameter type-id='type-id-545'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1291'>
+    <function-type size-in-bits='64' id='type-id-1297'>
       <parameter type-id='type-id-565'/>
       <parameter type-id='type-id-545'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1292'>
+    <function-type size-in-bits='64' id='type-id-1298'>
       <parameter type-id='type-id-565'/>
       <parameter type-id='type-id-127'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1293'>
+    <function-type size-in-bits='64' id='type-id-1299'>
       <parameter type-id='type-id-230'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1294'>
+    <function-type size-in-bits='64' id='type-id-1300'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-853'/>
-      <parameter type-id='type-id-1366'/>
+      <parameter type-id='type-id-1395'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1295'>
+    <function-type size-in-bits='64' id='type-id-1301'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1296'>
+    <function-type size-in-bits='64' id='type-id-1302'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-928'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1297'>
+    <function-type size-in-bits='64' id='type-id-1303'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-53'/>
-      <parameter type-id='type-id-1137'/>
+      <parameter type-id='type-id-1143'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1298'>
+    <function-type size-in-bits='64' id='type-id-1304'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-53'/>
-      <parameter type-id='type-id-1367'/>
+      <parameter type-id='type-id-1396'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1299'>
+    <function-type size-in-bits='64' id='type-id-1305'>
       <parameter type-id='type-id-230'/>
-      <parameter type-id='type-id-1329'/>
+      <parameter type-id='type-id-1335'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1300'>
+    <function-type size-in-bits='64' id='type-id-1306'>
       <parameter type-id='type-id-230'/>
-      <parameter type-id='type-id-1329'/>
-      <parameter type-id='type-id-1366'/>
+      <parameter type-id='type-id-1335'/>
+      <parameter type-id='type-id-1395'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1301'>
+    <function-type size-in-bits='64' id='type-id-1307'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-655'/>
       <parameter type-id='type-id-349'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1302'>
+    <function-type size-in-bits='64' id='type-id-1308'>
       <parameter type-id='type-id-230'/>
-      <parameter type-id='type-id-1368'/>
+      <parameter type-id='type-id-1397'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1303'>
+    <function-type size-in-bits='64' id='type-id-1309'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1304'>
-      <parameter type-id='type-id-1394'/>
+    <function-type size-in-bits='64' id='type-id-1310'>
+      <parameter type-id='type-id-1423'/>
       <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-1385'/>
+      <parameter type-id='type-id-1414'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1305'>
+    <function-type size-in-bits='64' id='type-id-1311'>
       <parameter type-id='type-id-827'/>
       <parameter type-id='type-id-227'/>
-      <parameter type-id='type-id-1191'/>
+      <parameter type-id='type-id-1197'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1306'>
+    <function-type size-in-bits='64' id='type-id-1312'>
       <parameter type-id='type-id-827'/>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1307'>
+    <function-type size-in-bits='64' id='type-id-1313'>
       <parameter type-id='type-id-827'/>
       <parameter type-id='type-id-565'/>
       <parameter type-id='type-id-227'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1308'>
+    <function-type size-in-bits='64' id='type-id-1314'>
       <parameter type-id='type-id-125'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1309'>
+    <function-type size-in-bits='64' id='type-id-1315'>
       <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1310'>
+    <function-type size-in-bits='64' id='type-id-1316'>
       <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-114'/>
       <parameter type-id='type-id-127'/>
@@ -10823,148 +10850,34 @@
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1338'>
-      <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-53'/>
-      <parameter type-id='type-id-321'/>
-      <parameter type-id='type-id-321'/>
-      <return type-id='type-id-67'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1339'>
-      <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-113'/>
-      <parameter type-id='type-id-114'/>
-      <return type-id='type-id-67'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1340'>
-      <parameter type-id='type-id-1376'/>
-      <return type-id='type-id-67'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1341'>
-      <parameter type-id='type-id-230'/>
-      <parameter type-id='type-id-1388'/>
-      <return type-id='type-id-67'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1355'>
-      <parameter type-id='type-id-125'/>
-      <parameter type-id='type-id-114'/>
-      <return type-id='type-id-655'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1365'>
-      <parameter type-id='type-id-51'/>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-361'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1370'>
-      <parameter type-id='type-id-51'/>
-      <return type-id='type-id-1369'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1406'>
-      <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-1362'/>
-      <return type-id='type-id-1554'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1407'>
-      <parameter type-id='type-id-1320'/>
-      <parameter type-id='type-id-1362'/>
-      <return type-id='type-id-1554'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1408'>
-      <return type-id='type-id-170'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1409'>
-      <parameter type-id='type-id-503'/>
-      <return type-id='type-id-170'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1410'>
-      <parameter type-id='type-id-503'/>
-      <parameter type-id='type-id-163'/>
-      <return type-id='type-id-170'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1411'>
-      <parameter type-id='type-id-399'/>
-      <return type-id='type-id-170'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1412'>
-      <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-75'/>
-      <parameter type-id='type-id-1068'/>
-      <return type-id='type-id-170'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1413'>
-      <parameter type-id='type-id-655'/>
-      <parameter type-id='type-id-1543'/>
-      <return type-id='type-id-170'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1414'>
-      <parameter type-id='type-id-250'/>
-      <parameter type-id='type-id-655'/>
-      <parameter type-id='type-id-114'/>
-      <parameter type-id='type-id-174'/>
-      <parameter type-id='type-id-301'/>
-      <parameter type-id='type-id-114'/>
-      <return type-id='type-id-164'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1415'>
-      <parameter type-id='type-id-250'/>
-      <parameter type-id='type-id-1024'/>
-      <parameter type-id='type-id-174'/>
-      <parameter type-id='type-id-301'/>
-      <parameter type-id='type-id-114'/>
-      <return type-id='type-id-164'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1416'>
-      <parameter type-id='type-id-400'/>
-      <return type-id='type-id-400'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1417'>
-      <return type-id='type-id-521'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1418'>
-      <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-321'/>
-      <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-321'/>
-      <parameter type-id='type-id-321'/>
-      <parameter type-id='type-id-113'/>
-      <return type-id='type-id-321'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1419'>
-      <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-321'/>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-321'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1420'>
-      <parameter type-id='type-id-363'/>
-      <parameter type-id='type-id-1384'/>
-      <return type-id='type-id-1384'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1421'>
-      <parameter type-id='type-id-250'/>
-      <return type-id='type-id-174'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1422'>
+    <function-type size-in-bits='64' id='type-id-1344'>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-174'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1423'>
+    <function-type size-in-bits='64' id='type-id-1345'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-174'/>
-      <parameter type-id='type-id-1337'/>
+      <parameter type-id='type-id-1343'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1424'>
+    <function-type size-in-bits='64' id='type-id-1346'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-174'/>
-      <parameter type-id='type-id-1337'/>
+      <parameter type-id='type-id-1343'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1425'>
+    <function-type size-in-bits='64' id='type-id-1347'>
+      <parameter type-id='type-id-323'/>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-321'/>
+      <return type-id='type-id-67'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1348'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-268'/>
       <parameter type-id='type-id-1065'/>
@@ -10973,24 +10886,24 @@
       <parameter type-id='type-id-174'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1426'>
+    <function-type size-in-bits='64' id='type-id-1349'>
       <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-1337'/>
+      <parameter type-id='type-id-1343'/>
       <parameter type-id='type-id-376'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1427'>
+    <function-type size-in-bits='64' id='type-id-1350'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-655'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-174'/>
-      <parameter type-id='type-id-1337'/>
+      <parameter type-id='type-id-1343'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1428'>
+    <function-type size-in-bits='64' id='type-id-1351'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-321'/>
       <parameter type-id='type-id-323'/>
@@ -10999,53 +10912,63 @@
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1429'>
-      <parameter type-id='type-id-1320'/>
+    <function-type size-in-bits='64' id='type-id-1352'>
+      <parameter type-id='type-id-323'/>
+      <parameter type-id='type-id-113'/>
+      <parameter type-id='type-id-114'/>
+      <return type-id='type-id-67'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1353'>
+      <parameter type-id='type-id-1326'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-321'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1430'>
-      <parameter type-id='type-id-1324'/>
-      <parameter type-id='type-id-1315'/>
+    <function-type size-in-bits='64' id='type-id-1354'>
+      <parameter type-id='type-id-1330'/>
+      <parameter type-id='type-id-1321'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1431'>
+    <function-type size-in-bits='64' id='type-id-1355'>
       <parameter type-id='type-id-268'/>
       <parameter type-id='type-id-1060'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1432'>
+    <function-type size-in-bits='64' id='type-id-1356'>
       <parameter type-id='type-id-268'/>
       <parameter type-id='type-id-1060'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-174'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1433'>
+    <function-type size-in-bits='64' id='type-id-1357'>
       <parameter type-id='type-id-776'/>
-      <parameter type-id='type-id-1346'/>
+      <parameter type-id='type-id-1375'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1434'>
+    <function-type size-in-bits='64' id='type-id-1358'>
       <parameter type-id='type-id-776'/>
-      <parameter type-id='type-id-1346'/>
+      <parameter type-id='type-id-1375'/>
       <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-174'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1435'>
+    <function-type size-in-bits='64' id='type-id-1359'>
       <parameter type-id='type-id-376'/>
       <parameter type-id='type-id-323'/>
-      <parameter type-id='type-id-1337'/>
+      <parameter type-id='type-id-1343'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-113'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1436'>
+    <function-type size-in-bits='64' id='type-id-1360'>
+      <parameter type-id='type-id-1405'/>
+      <return type-id='type-id-67'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1361'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-24'/>
@@ -11053,7 +10976,7 @@
       <parameter type-id='type-id-321'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1437'>
+    <function-type size-in-bits='64' id='type-id-1362'>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-163'/>
@@ -11061,41 +10984,102 @@
       <parameter type-id='type-id-321'/>
       <return type-id='type-id-1551'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1438'>
-      <parameter type-id='type-id-1380'/>
-      <parameter type-id='type-id-99'/>
-      <return type-id='type-id-99'/>
+    <function-type size-in-bits='64' id='type-id-1363'>
+      <parameter type-id='type-id-230'/>
+      <parameter type-id='type-id-1417'/>
+      <return type-id='type-id-67'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1439'>
+    <function-type size-in-bits='64' id='type-id-1364'>
+      <return type-id='type-id-521'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1365'>
+      <parameter type-id='type-id-323'/>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-323'/>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-113'/>
+      <return type-id='type-id-321'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1366'>
+      <parameter type-id='type-id-323'/>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-321'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1367'>
+      <parameter type-id='type-id-363'/>
+      <parameter type-id='type-id-1413'/>
+      <return type-id='type-id-1413'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1368'>
       <parameter type-id='type-id-250'/>
       <return type-id='type-id-103'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1440'>
-      <parameter type-id='type-id-268'/>
-      <parameter type-id='type-id-1060'/>
+    <function-type size-in-bits='64' id='type-id-1369'>
+      <parameter type-id='type-id-250'/>
+      <parameter type-id='type-id-655'/>
+      <parameter type-id='type-id-114'/>
+      <parameter type-id='type-id-174'/>
+      <parameter type-id='type-id-301'/>
+      <parameter type-id='type-id-114'/>
+      <return type-id='type-id-164'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1370'>
+      <parameter type-id='type-id-250'/>
+      <parameter type-id='type-id-1024'/>
+      <parameter type-id='type-id-174'/>
+      <parameter type-id='type-id-301'/>
+      <parameter type-id='type-id-114'/>
+      <return type-id='type-id-164'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1384'>
+      <parameter type-id='type-id-125'/>
+      <parameter type-id='type-id-114'/>
+      <return type-id='type-id-655'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1394'>
+      <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-53'/>
-      <return type-id='type-id-320'/>
+      <return type-id='type-id-361'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1399'>
+      <parameter type-id='type-id-51'/>
+      <return type-id='type-id-1398'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1438'>
+      <parameter type-id='type-id-323'/>
+      <parameter type-id='type-id-1391'/>
+      <return type-id='type-id-1554'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1439'>
+      <parameter type-id='type-id-1326'/>
+      <parameter type-id='type-id-1391'/>
+      <return type-id='type-id-1554'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1440'>
+      <parameter type-id='type-id-1409'/>
+      <return type-id='type-id-113'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1441'>
-      <parameter type-id='type-id-268'/>
-      <parameter type-id='type-id-1065'/>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-320'/>
+      <parameter type-id='type-id-1409'/>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-99'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1442'>
-      <parameter type-id='type-id-1456'/>
+      <parameter type-id='type-id-1455'/>
       <return type-id='type-id-1542'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1443'>
-      <parameter type-id='type-id-1456'/>
+      <parameter type-id='type-id-1455'/>
       <parameter type-id='type-id-660'/>
       <return type-id='type-id-1542'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1447'>
-      <parameter type-id='type-id-1380'/>
-      <return type-id='type-id-113'/>
+    <function-type size-in-bits='64' id='type-id-1444'>
+      <parameter type-id='type-id-250'/>
+      <return type-id='type-id-174'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1448'>
+    <function-type size-in-bits='64' id='type-id-1445'>
       <parameter type-id='type-id-323'/>
       <parameter type-id='type-id-114'/>
       <parameter type-id='type-id-114'/>
@@ -11103,376 +11087,392 @@
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-114'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1449'>
-      <parameter type-id='type-id-1389'/>
-      <parameter type-id='type-id-1388'/>
+    <function-type size-in-bits='64' id='type-id-1446'>
+      <parameter type-id='type-id-1418'/>
+      <parameter type-id='type-id-1417'/>
       <return type-id='type-id-114'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1450'>
+    <function-type size-in-bits='64' id='type-id-1447'>
       <parameter type-id='type-id-125'/>
       <return type-id='type-id-114'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1455'>
-      <parameter type-id='type-id-1356'/>
+    <function-type size-in-bits='64' id='type-id-1448'>
+      <parameter type-id='type-id-268'/>
+      <parameter type-id='type-id-1060'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-320'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1449'>
+      <parameter type-id='type-id-268'/>
+      <parameter type-id='type-id-1065'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-320'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1454'>
+      <parameter type-id='type-id-1385'/>
       <return type-id='type-id-827'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1456'>
+      <return type-id='type-id-1519'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1457'>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-883'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1458'>
-      <parameter type-id='type-id-883'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-297'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1459'>
-      <parameter type-id='type-id-297'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1143'/>
+      <parameter type-id='type-id-1385'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1460'>
-      <parameter type-id='type-id-1137'/>
-      <parameter type-id='type-id-1356'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-227'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1461'>
       <parameter type-id='type-id-227'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-51'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1462'>
-      <parameter type-id='type-id-227'/>
-      <parameter type-id='type-id-51'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-687'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1463'>
-      <parameter type-id='type-id-687'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-250'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1464'>
       <parameter type-id='type-id-250'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1339'/>
+      <parameter type-id='type-id-1329'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1465'>
-      <parameter type-id='type-id-250'/>
-      <parameter type-id='type-id-1333'/>
-      <parameter type-id='type-id-1323'/>
-      <return type-id='type-id-1520'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1466'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-722'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-301'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1467'>
+    <function-type size-in-bits='64' id='type-id-1466'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-722'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-301'/>
       <parameter type-id='type-id-114'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1468'>
+    <function-type size-in-bits='64' id='type-id-1467'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-170'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1469'>
+    <function-type size-in-bits='64' id='type-id-1468'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-301'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1470'>
+    <function-type size-in-bits='64' id='type-id-1469'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-301'/>
       <parameter type-id='type-id-114'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1471'>
+    <function-type size-in-bits='64' id='type-id-1470'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-723'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1472'>
+    <function-type size-in-bits='64' id='type-id-1471'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-114'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1473'>
+    <function-type size-in-bits='64' id='type-id-1472'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-301'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1474'>
-      <parameter type-id='type-id-1166'/>
-      <return type-id='type-id-1520'/>
+    <function-type size-in-bits='64' id='type-id-1473'>
+      <parameter type-id='type-id-1172'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1475'>
+    <function-type size-in-bits='64' id='type-id-1474'>
       <parameter type-id='type-id-323'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1476'>
+    <function-type size-in-bits='64' id='type-id-1475'>
       <parameter type-id='type-id-399'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1477'>
+    <function-type size-in-bits='64' id='type-id-1476'>
       <parameter type-id='type-id-399'/>
       <parameter type-id='type-id-399'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1478'>
+    <function-type size-in-bits='64' id='type-id-1477'>
       <parameter type-id='type-id-399'/>
       <parameter type-id='type-id-1530'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1479'>
+    <function-type size-in-bits='64' id='type-id-1478'>
       <parameter type-id='type-id-295'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1480'>
+    <function-type size-in-bits='64' id='type-id-1479'>
       <parameter type-id='type-id-51'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1481'>
+    <function-type size-in-bits='64' id='type-id-1480'>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-53'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1553'>
       <parameter type-id='type-id-53'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1482'>
-      <parameter type-id='type-id-1320'/>
-      <return type-id='type-id-1520'/>
+    <function-type size-in-bits='64' id='type-id-1481'>
+      <parameter type-id='type-id-1326'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1483'>
-      <parameter type-id='type-id-1324'/>
+    <function-type size-in-bits='64' id='type-id-1482'>
+      <parameter type-id='type-id-1330'/>
       <parameter type-id='type-id-67'/>
       <parameter type-id='type-id-67'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1483'>
+      <parameter type-id='type-id-268'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1484'>
       <parameter type-id='type-id-268'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1339'/>
+      <parameter type-id='type-id-1329'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1485'>
-      <parameter type-id='type-id-268'/>
-      <parameter type-id='type-id-1333'/>
-      <parameter type-id='type-id-1323'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1340'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1486'>
-      <parameter type-id='type-id-1334'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1340'/>
+      <parameter type-id='type-id-620'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1487'>
-      <parameter type-id='type-id-1334'/>
-      <parameter type-id='type-id-620'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-166'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1488'>
       <parameter type-id='type-id-166'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1489'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-751'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1490'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-751'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1372'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1491'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1343'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-75'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1492'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-75'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1493'>
-      <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-75'/>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1494'>
-      <parameter type-id='type-id-75'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-263'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1495'>
       <parameter type-id='type-id-263'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-163'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1496'>
-      <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-163'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-655'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1497'>
       <parameter type-id='type-id-655'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1074'/>
+      <parameter type-id='type-id-1074'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1498'>
-      <parameter type-id='type-id-655'/>
-      <parameter type-id='type-id-1068'/>
-      <parameter type-id='type-id-1068'/>
-      <return type-id='type-id-1520'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1499'>
       <parameter type-id='type-id-655'/>
       <parameter type-id='type-id-113'/>
       <parameter type-id='type-id-113'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1544'>
       <parameter type-id='type-id-648'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1500'>
-      <parameter type-id='type-id-1380'/>
-      <return type-id='type-id-1520'/>
+    <function-type size-in-bits='64' id='type-id-1499'>
+      <parameter type-id='type-id-1409'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1501'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1500'>
+      <parameter type-id='type-id-1409'/>
       <parameter type-id='type-id-53'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1502'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1501'>
+      <parameter type-id='type-id-1409'/>
       <parameter type-id='type-id-171'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1503'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1502'>
+      <parameter type-id='type-id-1409'/>
       <parameter type-id='type-id-99'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1504'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1503'>
+      <parameter type-id='type-id-1409'/>
       <parameter type-id='type-id-105'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1505'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1504'>
+      <parameter type-id='type-id-1409'/>
       <parameter type-id='type-id-111'/>
       <parameter type-id='type-id-122'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1506'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1505'>
+      <parameter type-id='type-id-1409'/>
       <parameter type-id='type-id-113'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1507'>
-      <parameter type-id='type-id-1380'/>
+    <function-type size-in-bits='64' id='type-id-1506'>
+      <parameter type-id='type-id-1409'/>
       <parameter type-id='type-id-1530'/>
       <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-53'/>
       <parameter type-id='type-id-113'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1508'>
+    <function-type size-in-bits='64' id='type-id-1507'>
       <parameter type-id='type-id-565'/>
       <parameter type-id='type-id-323'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1509'>
+    <function-type size-in-bits='64' id='type-id-1508'>
       <parameter type-id='type-id-565'/>
       <parameter type-id='type-id-127'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1510'>
+    <function-type size-in-bits='64' id='type-id-1509'>
       <parameter type-id='type-id-230'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1511'>
-      <parameter type-id='type-id-1397'/>
-      <return type-id='type-id-1520'/>
+    <function-type size-in-bits='64' id='type-id-1510'>
+      <parameter type-id='type-id-1426'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1512'>
+    <function-type size-in-bits='64' id='type-id-1511'>
       <parameter type-id='type-id-400'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1513'>
+    <function-type size-in-bits='64' id='type-id-1512'>
       <parameter type-id='type-id-125'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1514'>
-      <parameter type-id='type-id-1456'/>
+    <function-type size-in-bits='64' id='type-id-1513'>
+      <parameter type-id='type-id-1455'/>
       <parameter type-id='type-id-114'/>
       <parameter type-id='type-id-114'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1515'>
+    <function-type size-in-bits='64' id='type-id-1514'>
       <parameter type-id='type-id-127'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1516'>
+    <function-type size-in-bits='64' id='type-id-1515'>
       <parameter type-id='type-id-127'/>
-      <parameter type-id='type-id-1177'/>
-      <return type-id='type-id-1520'/>
+      <parameter type-id='type-id-1183'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1517'>
+    <function-type size-in-bits='64' id='type-id-1516'>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-127'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1518'>
+    <function-type size-in-bits='64' id='type-id-1517'>
       <parameter type-id='type-id-1532'/>
-      <return type-id='type-id-1520'/>
+      <return type-id='type-id-1519'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1521'>
+    <function-type size-in-bits='64' id='type-id-1520'>
       <return type-id='type-id-127'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1522'>
+    <function-type size-in-bits='64' id='type-id-1521'>
       <parameter type-id='type-id-503'/>
-      <parameter type-id='type-id-1095'/>
+      <parameter type-id='type-id-1101'/>
       <return type-id='type-id-127'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1523'>
+    <function-type size-in-bits='64' id='type-id-1522'>
       <parameter type-id='type-id-250'/>
       <return type-id='type-id-127'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1524'>
+    <function-type size-in-bits='64' id='type-id-1523'>
       <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-174'/>
-      <parameter type-id='type-id-1164'/>
+      <parameter type-id='type-id-1170'/>
       <parameter type-id='type-id-349'/>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-127'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1525'>
+    <function-type size-in-bits='64' id='type-id-1524'>
       <parameter type-id='type-id-268'/>
       <return type-id='type-id-127'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1526'>
+    <function-type size-in-bits='64' id='type-id-1525'>
       <parameter type-id='type-id-565'/>
-      <parameter type-id='type-id-1337'/>
+      <parameter type-id='type-id-1343'/>
       <return type-id='type-id-127'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1527'>
+    <function-type size-in-bits='64' id='type-id-1526'>
       <parameter type-id='type-id-565'/>
       <parameter type-id='type-id-127'/>
-      <parameter type-id='type-id-1337'/>
+      <parameter type-id='type-id-1343'/>
       <return type-id='type-id-127'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1528'>
-      <parameter type-id='type-id-1391'/>
+    <function-type size-in-bits='64' id='type-id-1527'>
+      <parameter type-id='type-id-1420'/>
       <return type-id='type-id-127'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1528'>
+      <parameter type-id='type-id-400'/>
+      <return type-id='type-id-400'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1529'>
       <parameter type-id='type-id-127'/>
       <return type-id='type-id-127'/>

diff --git a/tests/data/test-read-dwarf/test-libaaudio.so.abi b/tests/data/test-read-dwarf/test-libaaudio.so.abi
index 3f63afaaee01a1845509fc8b585d71b3f2b6e9af..170426fcc5e039ac2ce2813f2666943ab1293f60 100644 (file)
--- a/tests/data/test-read-dwarf/test-libaaudio.so.abi
+++ b/tests/data/test-read-dwarf/test-libaaudio.so.abi
@@ -290,6 +290,7 @@
     <pointer-type-def type-id='f077d3f8' size-in-bits='64' id='5ea27396'/>
     <pointer-type-def type-id='a6c45d85' size-in-bits='64' id='361f7a7d'/>
     <pointer-type-def type-id='e322b6ef' size-in-bits='64' id='c5f12884'/>
+    <pointer-type-def type-id='add676f6' size-in-bits='64' id='ed274b28'/>
     <pointer-type-def type-id='96ee24a5' size-in-bits='64' id='585e1de9'/>
     <pointer-type-def type-id='95e97e5e' size-in-bits='64' id='7292109c'/>
     <pointer-type-def type-id='9da381c4' size-in-bits='64' id='cb785ebf'/>
@@ -297,7 +298,6 @@
     <pointer-type-def type-id='3d7d8cbf' size-in-bits='64' id='a68021ce'/>
     <pointer-type-def type-id='c9d12d66' size-in-bits='64' id='b2eb2c3f'/>
     <pointer-type-def type-id='dddf6ca2' size-in-bits='64' id='d915a820'/>
-    <pointer-type-def type-id='055f9de3' size-in-bits='64' id='d51a0d27'/>
     <pointer-type-def type-id='ee076206' size-in-bits='64' id='953b12f8'/>
     <pointer-type-def type-id='d024f83e' size-in-bits='64' id='8b51a308'/>
     <pointer-type-def type-id='48b5725f' size-in-bits='64' id='eaa32e2f'/>
@@ -2032,7 +2032,7 @@
     <typedef-decl name='AAudioStream' type-id='119dbfcb' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='487' column='1' id='f41d1deb'/>
     <typedef-decl name='AAudioStreamBuilder' type-id='813682d4' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='488' column='1' id='122f757a'/>
     <typedef-decl name='aaudio_data_callback_result_t' type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='832' column='1' id='ae10ac8d'/>
-    <typedef-decl name='AAudioStream_dataCallback' type-id='d51a0d27' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='880' column='1' id='edb6186f'/>
+    <typedef-decl name='AAudioStream_dataCallback' type-id='ed274b28' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='880' column='1' id='edb6186f'/>
     <typedef-decl name='AAudioStream_errorCallback' type-id='8b51a308' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='966' column='1' id='2e91990d'/>
     <typedef-decl name='aaudio_policy_t' type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudioTesting.h' line='50' column='1' id='d062bfb5'/>
     <function-decl name='AAudio_convertResultToText' mangled-name='AAudio_convertResultToText' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudio_convertResultToText@@LIBAAUDIO'>
@@ -2307,18 +2307,18 @@
     <typedef-decl name='va_list' type-id='7f896fb4' filepath='prebuilts/clang/host/linux-x86/clang-r416183b/lib64/clang/12.0.5/include/stdarg.h' line='14' column='1' id='2aee9912'/>
     <typedef-decl name='size_t' type-id='7359adad' filepath='prebuilts/clang/host/linux-x86/clang-r416183b/lib64/clang/12.0.5/include/stddef.h' line='46' column='1' id='b59d7dce'/>
     <typedef-decl name='audio_format_t' type-id='ff439793' filepath='system/media/audio/include/system/audio-hal-enums.h' line='616' column='1' id='aff86d3f'/>
-    <function-type size-in-bits='64' id='96ee24a5'>
-      <parameter type-id='eaa32e2f'/>
-      <parameter type-id='eaa32e2f'/>
-      <return type-id='95e97e5e'/>
-    </function-type>
-    <function-type size-in-bits='64' id='055f9de3'>
+    <function-type size-in-bits='64' id='add676f6'>
       <parameter type-id='b2a1b704'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='3ff5601b'/>
       <return type-id='ae10ac8d'/>
     </function-type>
+    <function-type size-in-bits='64' id='96ee24a5'>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='eaa32e2f'/>
+      <return type-id='95e97e5e'/>
+    </function-type>
     <function-type size-in-bits='64' id='ee076206'>
       <return type-id='48b5725f'/>
     </function-type>

diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index ff14d87d3f370f905c5452de232423b8ccd55c85..6569add3550294a2fbf31f749af893a4a977fc89 100644 (file)
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -3267,40 +3267,40 @@
         <var-decl name='reserved3' type-id='eaa32e2f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='153' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='GetVersion' type-id='4b15419a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='155' column='1'/>
+        <var-decl name='GetVersion' type-id='18d755d9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='155' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='DefineClass' type-id='3358ddb3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='157' column='1'/>
+        <var-decl name='DefineClass' type-id='b4e3f2fb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='FindClass' type-id='e905d0ac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='159' column='1'/>
+        <var-decl name='FindClass' type-id='a247d414' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='159' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='FromReflectedMethod' type-id='09176273' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='161' column='1'/>
+        <var-decl name='FromReflectedMethod' type-id='133c13b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='161' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='FromReflectedField' type-id='04aa9df2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='162' column='1'/>
+        <var-decl name='FromReflectedField' type-id='1408155c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='162' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='ToReflectedMethod' type-id='582ba311' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='164' column='1'/>
+        <var-decl name='ToReflectedMethod' type-id='aaa7cbbb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='164' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='GetSuperclass' type-id='93737cc2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='166' column='1'/>
+        <var-decl name='GetSuperclass' type-id='6a4b7aaa' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='166' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='IsAssignableFrom' type-id='f39f8bbd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='167' column='1'/>
+        <var-decl name='IsAssignableFrom' type-id='20c24fe1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='167' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ToReflectedField' type-id='58398eee' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='170' column='1'/>
+        <var-decl name='ToReflectedField' type-id='3c391da4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='170' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='Throw' type-id='4a0b9bf1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='172' column='1'/>
+        <var-decl name='Throw' type-id='9a1d84ce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='172' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='ThrowNew' type-id='0571aa74' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='173' column='1'/>
+        <var-decl name='ThrowNew' type-id='cf5d6c0d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='ExceptionOccurred' type-id='7fdf58e1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='174' column='1'/>
+        <var-decl name='ExceptionOccurred' type-id='b3dfc495' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='ExceptionDescribe' type-id='8bc971a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='175' column='1'/>
@@ -3312,13 +3312,13 @@
         <var-decl name='FatalError' type-id='2deb20e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='177' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='PushLocalFrame' type-id='9aeb7958' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='179' column='1'/>
+        <var-decl name='PushLocalFrame' type-id='5496326b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='179' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='PopLocalFrame' type-id='a0ba6dc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='180' column='1'/>
+        <var-decl name='PopLocalFrame' type-id='510ae83a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='NewGlobalRef' type-id='a0ba6dc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='182' column='1'/>
+        <var-decl name='NewGlobalRef' type-id='510ae83a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='182' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='DeleteGlobalRef' type-id='8a1f7e9e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='183' column='1'/>
@@ -3327,115 +3327,115 @@
         <var-decl name='DeleteLocalRef' type-id='8a1f7e9e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='184' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='IsSameObject' type-id='782c53f5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='185' column='1'/>
+        <var-decl name='IsSameObject' type-id='3d0f6989' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='185' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='NewLocalRef' type-id='a0ba6dc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='187' column='1'/>
+        <var-decl name='NewLocalRef' type-id='510ae83a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='187' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='EnsureLocalCapacity' type-id='9aeb7958' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='188' column='1'/>
+        <var-decl name='EnsureLocalCapacity' type-id='5496326b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='188' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='AllocObject' type-id='151a1d63' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='190' column='1'/>
+        <var-decl name='AllocObject' type-id='4dd53dc5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='NewObject' type-id='f8af7982' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='191' column='1'/>
+        <var-decl name='NewObject' type-id='0bf53c2c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='191' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='NewObjectV' type-id='a01a6e09' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='192' column='1'/>
+        <var-decl name='NewObjectV' type-id='f6c19e77' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='192' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='NewObjectA' type-id='f0a0ff54' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='193' column='1'/>
+        <var-decl name='NewObjectA' type-id='cb260be6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='193' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
-        <var-decl name='GetObjectClass' type-id='b5f4f133' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='195' column='1'/>
+        <var-decl name='GetObjectClass' type-id='36621f5b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='195' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='IsInstanceOf' type-id='bcee08ac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='196' column='1'/>
+        <var-decl name='IsInstanceOf' type-id='cfa619a8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='196' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1056'>
-        <var-decl name='GetMethodID' type-id='30974818' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='197' column='1'/>
+        <var-decl name='GetMethodID' type-id='e787d4e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='197' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='CallObjectMethod' type-id='2dab161d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='199' column='1'/>
+        <var-decl name='CallObjectMethod' type-id='e3a17ed7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='CallObjectMethodV' type-id='0290ef52' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='200' column='1'/>
+        <var-decl name='CallObjectMethodV' type-id='886195f8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='200' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='CallObjectMethodA' type-id='4278623b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='201' column='1'/>
+        <var-decl name='CallObjectMethodA' type-id='6ea5e66d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='201' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='CallBooleanMethod' type-id='461c5f2a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='202' column='1'/>
+        <var-decl name='CallBooleanMethod' type-id='03bc2706' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='202' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='CallBooleanMethodV' type-id='88d99751' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='203' column='1'/>
+        <var-decl name='CallBooleanMethodV' type-id='71bf1195' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1248'>
-        <var-decl name='CallBooleanMethodA' type-id='74823d0c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='204' column='1'/>
+        <var-decl name='CallBooleanMethodA' type-id='61421910' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='204' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='CallByteMethod' type-id='17d955f8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='205' column='1'/>
+        <var-decl name='CallByteMethod' type-id='40bf8efb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='205' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1312'>
-        <var-decl name='CallByteMethodV' type-id='44bea17b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='206' column='1'/>
+        <var-decl name='CallByteMethodV' type-id='2b49d1c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='206' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='CallByteMethodA' type-id='ed0795aa' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='207' column='1'/>
+        <var-decl name='CallByteMethodA' type-id='5a3ae4f9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='207' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1376'>
-        <var-decl name='CallCharMethod' type-id='e747dee6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='208' column='1'/>
+        <var-decl name='CallCharMethod' type-id='103c63e9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='208' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='CallCharMethodV' type-id='d31f1c35' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='209' column='1'/>
+        <var-decl name='CallCharMethodV' type-id='9f915366' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='209' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1440'>
-        <var-decl name='CallCharMethodA' type-id='b0061f70' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='210' column='1'/>
+        <var-decl name='CallCharMethodA' type-id='422f8a4f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='210' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='CallShortMethod' type-id='bf87e894' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='211' column='1'/>
+        <var-decl name='CallShortMethod' type-id='072ec070' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='211' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='CallShortMethodV' type-id='5da2c37f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='212' column='1'/>
+        <var-decl name='CallShortMethodV' type-id='dd929613' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='212' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='CallShortMethodA' type-id='5db5877e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='213' column='1'/>
+        <var-decl name='CallShortMethodA' type-id='d9767672' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='213' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='CallIntMethod' type-id='3271bf2f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='214' column='1'/>
+        <var-decl name='CallIntMethod' type-id='d6261a6e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='214' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='CallIntMethodV' type-id='66ebe6b0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='215' column='1'/>
+        <var-decl name='CallIntMethodV' type-id='2af90a7d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='215' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1632'>
-        <var-decl name='CallIntMethodA' type-id='6c56e815' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='216' column='1'/>
+        <var-decl name='CallIntMethodA' type-id='df4df828' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='216' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='CallLongMethod' type-id='ea8867ec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='217' column='1'/>
+        <var-decl name='CallLongMethod' type-id='bd6709ae' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='217' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1696'>
-        <var-decl name='CallLongMethodV' type-id='5f929ab7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='218' column='1'/>
+        <var-decl name='CallLongMethodV' type-id='9b10843d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='218' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='CallLongMethodA' type-id='a55b35a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='219' column='1'/>
+        <var-decl name='CallLongMethodA' type-id='41244068' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1760'>
-        <var-decl name='CallFloatMethod' type-id='e8139a80' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='220' column='1'/>
+        <var-decl name='CallFloatMethod' type-id='ae148f89' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='220' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='CallFloatMethodV' type-id='9ac8b1e3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='221' column='1'/>
+        <var-decl name='CallFloatMethodV' type-id='ec4dcb46' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='221' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1824'>
-        <var-decl name='CallFloatMethodA' type-id='413559e2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='222' column='1'/>
+        <var-decl name='CallFloatMethodA' type-id='85bd6b6f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='222' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
-        <var-decl name='CallDoubleMethod' type-id='a642a393' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='223' column='1'/>
+        <var-decl name='CallDoubleMethod' type-id='2e12dc68' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='223' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1888'>
-        <var-decl name='CallDoubleMethodV' type-id='95fba39c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='224' column='1'/>
+        <var-decl name='CallDoubleMethodV' type-id='c1b190ab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='CallDoubleMethodA' type-id='a3ea0661' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='225' column='1'/>
+        <var-decl name='CallDoubleMethodA' type-id='462f7efa' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1952'>
         <var-decl name='CallVoidMethod' type-id='d696f7b3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='226' column='1'/>
@@ -3447,85 +3447,85 @@
         <var-decl name='CallVoidMethodA' type-id='921cf101' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='228' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='CallNonvirtualObjectMethod' type-id='4f7677f6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='230' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethod' type-id='c5c23b24' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='230' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='CallNonvirtualObjectMethodV' type-id='15887ec5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='232' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethodV' type-id='e8958f4f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='232' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='CallNonvirtualObjectMethodA' type-id='34c67260' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='234' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethodA' type-id='26376bee' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='234' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2144'>
-        <var-decl name='CallNonvirtualBooleanMethod' type-id='f1191df9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='236' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethod' type-id='1e0ea67d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='236' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='CallNonvirtualBooleanMethodV' type-id='ff535cb6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='238' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethodV' type-id='854f6072' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='238' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2208'>
-        <var-decl name='CallNonvirtualBooleanMethodA' type-id='fb38167f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='240' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethodA' type-id='58b3ba9b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='240' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='CallNonvirtualByteMethod' type-id='377b5e63' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='242' column='1'/>
+        <var-decl name='CallNonvirtualByteMethod' type-id='888e2c20' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='242' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2272'>
-        <var-decl name='CallNonvirtualByteMethodV' type-id='1930d02c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='244' column='1'/>
+        <var-decl name='CallNonvirtualByteMethodV' type-id='6cb0cfc3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='244' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='CallNonvirtualByteMethodA' type-id='1d2f8a91' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='246' column='1'/>
+        <var-decl name='CallNonvirtualByteMethodA' type-id='2b203982' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='246' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2336'>
-        <var-decl name='CallNonvirtualCharMethod' type-id='63f7d65d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='248' column='1'/>
+        <var-decl name='CallNonvirtualCharMethod' type-id='c569ef7a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='248' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='CallNonvirtualCharMethodV' type-id='c32cfa12' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='250' column='1'/>
+        <var-decl name='CallNonvirtualCharMethodV' type-id='1655d561' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2400'>
-        <var-decl name='CallNonvirtualCharMethodA' type-id='c2280e7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='252' column='1'/>
+        <var-decl name='CallNonvirtualCharMethodA' type-id='faf16cbc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='252' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='CallNonvirtualShortMethod' type-id='0de4af77' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='254' column='1'/>
+        <var-decl name='CallNonvirtualShortMethod' type-id='f7df945b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='254' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2464'>
-        <var-decl name='CallNonvirtualShortMethodV' type-id='255ff5d8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='256' column='1'/>
+        <var-decl name='CallNonvirtualShortMethodV' type-id='2626b4e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='256' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='CallNonvirtualShortMethodA' type-id='f4bbad8d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='258' column='1'/>
+        <var-decl name='CallNonvirtualShortMethodA' type-id='308377d9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='258' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2528'>
-        <var-decl name='CallNonvirtualIntMethod' type-id='ce1853bc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='260' column='1'/>
+        <var-decl name='CallNonvirtualIntMethod' type-id='a9da4265' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='260' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='CallNonvirtualIntMethodV' type-id='d5b0b547' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='262' column='1'/>
+        <var-decl name='CallNonvirtualIntMethodV' type-id='5452a27a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='262' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2592'>
-        <var-decl name='CallNonvirtualIntMethodA' type-id='3318dad6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='264' column='1'/>
+        <var-decl name='CallNonvirtualIntMethodA' type-id='9a705913' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='264' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='CallNonvirtualLongMethod' type-id='3459b4cf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='266' column='1'/>
+        <var-decl name='CallNonvirtualLongMethod' type-id='5d6eec25' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='266' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2656'>
-        <var-decl name='CallNonvirtualLongMethodV' type-id='a60dd490' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='268' column='1'/>
+        <var-decl name='CallNonvirtualLongMethodV' type-id='3eb668ba' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='268' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='CallNonvirtualLongMethodA' type-id='326df5b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='270' column='1'/>
+        <var-decl name='CallNonvirtualLongMethodA' type-id='d684a7d3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='270' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2720'>
-        <var-decl name='CallNonvirtualFloatMethod' type-id='eb164d0b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='272' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethod' type-id='9c2a8c9a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='272' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
-        <var-decl name='CallNonvirtualFloatMethodV' type-id='8c4e1254' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='274' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethodV' type-id='429f9ec1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='274' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2784'>
-        <var-decl name='CallNonvirtualFloatMethodA' type-id='a0bc56e9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='276' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethodA' type-id='5cc6425c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='276' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2816'>
-        <var-decl name='CallNonvirtualDoubleMethod' type-id='2dcc8b98' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='278' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethod' type-id='80ea0533' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='278' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2848'>
-        <var-decl name='CallNonvirtualDoubleMethodV' type-id='0e5e0cdb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='280' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethodV' type-id='69f1a17c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='280' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2880'>
-        <var-decl name='CallNonvirtualDoubleMethodA' type-id='a937264a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='282' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethodA' type-id='0bd83281' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='282' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2912'>
         <var-decl name='CallNonvirtualVoidMethod' type-id='c14258b8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='284' column='1'/>
@@ -3537,34 +3537,34 @@
         <var-decl name='CallNonvirtualVoidMethodA' type-id='41d61b6a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='288' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3008'>
-        <var-decl name='GetFieldID' type-id='5d99509b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='291' column='1'/>
+        <var-decl name='GetFieldID' type-id='268a1fc5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='291' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3040'>
-        <var-decl name='GetObjectField' type-id='7139225a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='293' column='1'/>
+        <var-decl name='GetObjectField' type-id='c4e4e430' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='GetBooleanField' type-id='13196dfd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='294' column='1'/>
+        <var-decl name='GetBooleanField' type-id='db9229f9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='294' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3104'>
-        <var-decl name='GetByteField' type-id='c8bc780f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='295' column='1'/>
+        <var-decl name='GetByteField' type-id='83e3c684' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='295' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
-        <var-decl name='GetCharField' type-id='239d7ad9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='296' column='1'/>
+        <var-decl name='GetCharField' type-id='d162eb86' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3168'>
-        <var-decl name='GetShortField' type-id='476f48bb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='297' column='1'/>
+        <var-decl name='GetShortField' type-id='c8f8ae67' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='297' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='GetIntField' type-id='f7e564c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='298' column='1'/>
+        <var-decl name='GetIntField' type-id='6ebc9001' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='298' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3232'>
-        <var-decl name='GetLongField' type-id='ac4e6cb3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='299' column='1'/>
+        <var-decl name='GetLongField' type-id='086b6f41' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='299' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='GetFloatField' type-id='06fbd437' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='300' column='1'/>
+        <var-decl name='GetFloatField' type-id='03d8b5a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='300' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3296'>
-        <var-decl name='GetDoubleField' type-id='47bc557c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='301' column='1'/>
+        <var-decl name='GetDoubleField' type-id='3a07cbbf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='301' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
         <var-decl name='SetObjectField' type-id='e333ff60' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='303' column='1'/>
@@ -3594,88 +3594,88 @@
         <var-decl name='SetDoubleField' type-id='195d3e42' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3616'>
-        <var-decl name='GetStaticMethodID' type-id='30974818' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='313' column='1'/>
+        <var-decl name='GetStaticMethodID' type-id='e787d4e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='313' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='CallStaticObjectMethod' type-id='f8af7982' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='315' column='1'/>
+        <var-decl name='CallStaticObjectMethod' type-id='0bf53c2c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3680'>
-        <var-decl name='CallStaticObjectMethodV' type-id='a01a6e09' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='316' column='1'/>
+        <var-decl name='CallStaticObjectMethodV' type-id='f6c19e77' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='316' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
-        <var-decl name='CallStaticObjectMethodA' type-id='f0a0ff54' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='317' column='1'/>
+        <var-decl name='CallStaticObjectMethodA' type-id='cb260be6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='317' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3744'>
-        <var-decl name='CallStaticBooleanMethod' type-id='916299d7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='318' column='1'/>
+        <var-decl name='CallStaticBooleanMethod' type-id='4be7351b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='CallStaticBooleanMethodV' type-id='412650f8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='319' column='1'/>
+        <var-decl name='CallStaticBooleanMethodV' type-id='d5caad24' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3808'>
-        <var-decl name='CallStaticBooleanMethodA' type-id='339f696d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='321' column='1'/>
+        <var-decl name='CallStaticBooleanMethodA' type-id='39665099' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='321' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='CallStaticByteMethod' type-id='ce9d67cd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='322' column='1'/>
+        <var-decl name='CallStaticByteMethod' type-id='26dda748' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='322' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3872'>
-        <var-decl name='CallStaticByteMethodV' type-id='478facc2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='323' column='1'/>
+        <var-decl name='CallStaticByteMethodV' type-id='a8ca014b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='CallStaticByteMethodA' type-id='db28fdcb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='324' column='1'/>
+        <var-decl name='CallStaticByteMethodA' type-id='c6a8fada' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3936'>
-        <var-decl name='CallStaticCharMethod' type-id='3bd86cfb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='325' column='1'/>
+        <var-decl name='CallStaticCharMethod' type-id='07b74db6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='CallStaticCharMethodV' type-id='dddcefc4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='326' column='1'/>
+        <var-decl name='CallStaticCharMethodV' type-id='a6dba205' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4000'>
-        <var-decl name='CallStaticCharMethodA' type-id='692552f9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='327' column='1'/>
+        <var-decl name='CallStaticCharMethodA' type-id='cdfaa320' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='CallStaticShortMethod' type-id='362e2831' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='328' column='1'/>
+        <var-decl name='CallStaticShortMethod' type-id='3ae45885' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4064'>
-        <var-decl name='CallStaticShortMethodV' type-id='d1173c4e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='329' column='1'/>
+        <var-decl name='CallStaticShortMethodV' type-id='5fd19dda' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='CallStaticShortMethodA' type-id='097c7407' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='330' column='1'/>
+        <var-decl name='CallStaticShortMethodA' type-id='501077b3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4128'>
-        <var-decl name='CallStaticIntMethod' type-id='64ca4b84' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='331' column='1'/>
+        <var-decl name='CallStaticIntMethod' type-id='08d19343' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='CallStaticIntMethodV' type-id='0323d66f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='332' column='1'/>
+        <var-decl name='CallStaticIntMethodV' type-id='661ce4cc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4192'>
-        <var-decl name='CallStaticIntMethodA' type-id='30b9a8ce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='333' column='1'/>
+        <var-decl name='CallStaticIntMethodA' type-id='670a3f71' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='CallStaticLongMethod' type-id='8c22ffe9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='334' column='1'/>
+        <var-decl name='CallStaticLongMethod' type-id='3c4aa383' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='334' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4256'>
-        <var-decl name='CallStaticLongMethodV' type-id='60306f66' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='335' column='1'/>
+        <var-decl name='CallStaticLongMethodV' type-id='e448b98c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='335' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4288'>
-        <var-decl name='CallStaticLongMethodA' type-id='1fda464f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='336' column='1'/>
+        <var-decl name='CallStaticLongMethodA' type-id='d94e6db1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='336' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4320'>
-        <var-decl name='CallStaticFloatMethod' type-id='4ed90115' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='337' column='1'/>
+        <var-decl name='CallStaticFloatMethod' type-id='ae1447d6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='337' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4352'>
-        <var-decl name='CallStaticFloatMethodV' type-id='87e0b5ea' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='338' column='1'/>
+        <var-decl name='CallStaticFloatMethodV' type-id='758e6965' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4384'>
-        <var-decl name='CallStaticFloatMethodA' type-id='caa57963' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='339' column='1'/>
+        <var-decl name='CallStaticFloatMethodA' type-id='416b80c0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='339' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='CallStaticDoubleMethod' type-id='04b3e5a0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='340' column='1'/>
+        <var-decl name='CallStaticDoubleMethod' type-id='b353f23d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='340' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4448'>
-        <var-decl name='CallStaticDoubleMethodV' type-id='be0ed943' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='341' column='1'/>
+        <var-decl name='CallStaticDoubleMethodV' type-id='8c402bb2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='341' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4480'>
-        <var-decl name='CallStaticDoubleMethodA' type-id='df8dc702' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='342' column='1'/>
+        <var-decl name='CallStaticDoubleMethodA' type-id='e020195b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='342' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4512'>
         <var-decl name='CallStaticVoidMethod' type-id='a86eb340' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='343' column='1'/>
@@ -3687,34 +3687,34 @@
         <var-decl name='CallStaticVoidMethodA' type-id='6fc0eca2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='345' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='GetStaticFieldID' type-id='5d99509b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='347' column='1'/>
+        <var-decl name='GetStaticFieldID' type-id='268a1fc5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='347' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4640'>
-        <var-decl name='GetStaticObjectField' type-id='d7560895' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='350' column='1'/>
+        <var-decl name='GetStaticObjectField' type-id='3da870f3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4672'>
-        <var-decl name='GetStaticBooleanField' type-id='4127a730' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='351' column='1'/>
+        <var-decl name='GetStaticBooleanField' type-id='ed8a4724' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='351' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4704'>
-        <var-decl name='GetStaticByteField' type-id='c404650a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='352' column='1'/>
+        <var-decl name='GetStaticByteField' type-id='fe0f389f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='352' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4736'>
-        <var-decl name='GetStaticCharField' type-id='0736b484' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='353' column='1'/>
+        <var-decl name='GetStaticCharField' type-id='56968229' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='353' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4768'>
-        <var-decl name='GetStaticShortField' type-id='0d5970ee' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='354' column='1'/>
+        <var-decl name='GetStaticShortField' type-id='4aef27a2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='354' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='GetStaticIntField' type-id='771014ab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='355' column='1'/>
+        <var-decl name='GetStaticIntField' type-id='9ef1ec6c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='355' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4832'>
-        <var-decl name='GetStaticLongField' type-id='a4a6a786' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='356' column='1'/>
+        <var-decl name='GetStaticLongField' type-id='6225d3ac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='356' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4864'>
-        <var-decl name='GetStaticFloatField' type-id='337e1672' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='357' column='1'/>
+        <var-decl name='GetStaticFloatField' type-id='2b8d1ec9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='357' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4896'>
-        <var-decl name='GetStaticDoubleField' type-id='bd4849d7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='358' column='1'/>
+        <var-decl name='GetStaticDoubleField' type-id='b2550e7a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='358' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4928'>
         <var-decl name='SetStaticObjectField' type-id='6c160b51' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='360' column='1'/>
@@ -3744,10 +3744,10 @@
         <var-decl name='SetStaticDoubleField' type-id='30411993' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='368' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5216'>
-        <var-decl name='NewString' type-id='40f183ab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='370' column='1'/>
+        <var-decl name='NewString' type-id='081e36ed' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='370' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5248'>
-        <var-decl name='GetStringLength' type-id='a7d6acc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='371' column='1'/>
+        <var-decl name='GetStringLength' type-id='6c0b3361' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='371' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5280'>
         <var-decl name='GetStringChars' type-id='e5a87447' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='372' column='1'/>
@@ -3756,10 +3756,10 @@
         <var-decl name='ReleaseStringChars' type-id='61d681d5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='373' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5344'>
-        <var-decl name='NewStringUTF' type-id='691ba251' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='374' column='1'/>
+        <var-decl name='NewStringUTF' type-id='629338b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='374' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5376'>
-        <var-decl name='GetStringUTFLength' type-id='a7d6acc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='375' column='1'/>
+        <var-decl name='GetStringUTFLength' type-id='6c0b3361' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='375' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5408'>
         <var-decl name='GetStringUTFChars' type-id='08565ebd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='377' column='1'/>
@@ -3768,40 +3768,40 @@
         <var-decl name='ReleaseStringUTFChars' type-id='ac33476b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='378' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5472'>
-        <var-decl name='GetArrayLength' type-id='a23a76e0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='379' column='1'/>
+        <var-decl name='GetArrayLength' type-id='1f46a8b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='379' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
-        <var-decl name='NewObjectArray' type-id='e4f2ab66' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='380' column='1'/>
+        <var-decl name='NewObjectArray' type-id='1665dab2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='380' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5536'>
-        <var-decl name='GetObjectArrayElement' type-id='0ae13aef' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='381' column='1'/>
+        <var-decl name='GetObjectArrayElement' type-id='e49a4e19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='381' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <var-decl name='SetObjectArrayElement' type-id='99167093' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='382' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5600'>
-        <var-decl name='NewBooleanArray' type-id='162473c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='384' column='1'/>
+        <var-decl name='NewBooleanArray' type-id='837c8b4a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='384' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5632'>
-        <var-decl name='NewByteArray' type-id='be49c182' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='385' column='1'/>
+        <var-decl name='NewByteArray' type-id='291f8894' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='385' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5664'>
-        <var-decl name='NewCharArray' type-id='ac74c0c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='386' column='1'/>
+        <var-decl name='NewCharArray' type-id='fb7cddfa' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5696'>
-        <var-decl name='NewShortArray' type-id='978c735e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='387' column='1'/>
+        <var-decl name='NewShortArray' type-id='e57ddc44' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='387' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5728'>
-        <var-decl name='NewIntArray' type-id='2041a8d7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='388' column='1'/>
+        <var-decl name='NewIntArray' type-id='4e1a93c3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='388' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5760'>
-        <var-decl name='NewLongArray' type-id='d7ea3436' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='389' column='1'/>
+        <var-decl name='NewLongArray' type-id='389a57a0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5792'>
-        <var-decl name='NewFloatArray' type-id='69b7386a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='390' column='1'/>
+        <var-decl name='NewFloatArray' type-id='5bbf72ec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='390' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5824'>
-        <var-decl name='NewDoubleArray' type-id='31ebf17b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='391' column='1'/>
+        <var-decl name='NewDoubleArray' type-id='4441b0b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='391' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5856'>
         <var-decl name='GetBooleanArrayElements' type-id='9b3c0ac2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='393' column='1'/>
@@ -3900,19 +3900,19 @@
         <var-decl name='SetDoubleArrayRegion' type-id='348c02e9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='451' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6880'>
-        <var-decl name='RegisterNatives' type-id='764ac7bf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='454' column='1'/>
+        <var-decl name='RegisterNatives' type-id='a3c133e0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6912'>
-        <var-decl name='UnregisterNatives' type-id='9447819d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='456' column='1'/>
+        <var-decl name='UnregisterNatives' type-id='6f79c54e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='456' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6944'>
-        <var-decl name='MonitorEnter' type-id='67a46ff2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='457' column='1'/>
+        <var-decl name='MonitorEnter' type-id='c21036b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='457' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='MonitorExit' type-id='67a46ff2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='458' column='1'/>
+        <var-decl name='MonitorExit' type-id='c21036b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='458' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7008'>
-        <var-decl name='GetJavaVM' type-id='5a4c25bf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='459' column='1'/>
+        <var-decl name='GetJavaVM' type-id='a65198e8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='459' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
         <var-decl name='GetStringRegion' type-id='fb79cfe8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='461' column='1'/>
@@ -3933,25 +3933,25 @@
         <var-decl name='ReleaseStringCritical' type-id='61d681d5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7232'>
-        <var-decl name='NewWeakGlobalRef' type-id='03bcacf3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='470' column='1'/>
+        <var-decl name='NewWeakGlobalRef' type-id='510ae83a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7264'>
         <var-decl name='DeleteWeakGlobalRef' type-id='ccc141a1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='471' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7296'>
-        <var-decl name='ExceptionCheck' type-id='5796afad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='473' column='1'/>
+        <var-decl name='ExceptionCheck' type-id='22b63871' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='473' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7328'>
-        <var-decl name='NewDirectByteBuffer' type-id='2c684c9f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='475' column='1'/>
+        <var-decl name='NewDirectByteBuffer' type-id='c011502d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='475' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7360'>
         <var-decl name='GetDirectBufferAddress' type-id='bd98ffce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='476' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7392'>
-        <var-decl name='GetDirectBufferCapacity' type-id='47653e05' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='477' column='1'/>
+        <var-decl name='GetDirectBufferCapacity' type-id='a2ff3a77' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='477' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7424'>
-        <var-decl name='GetObjectRefType' type-id='500eebf7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='480' column='1'/>
+        <var-decl name='GetObjectRefType' type-id='d85ab86b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='480' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='_JNIEnv' size-in-bits='32' is-struct='yes' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='489' column='1' id='c9459134'>
@@ -4019,20 +4019,57 @@
     <pointer-type-def type-id='c9459134' size-in-bits='32' id='71bed232'/>
     <pointer-type-def type-id='440aaf49' size-in-bits='32' id='85c463b1'/>
     <pointer-type-def type-id='2ca86b0d' size-in-bits='32' id='715a5bad'/>
+    <pointer-type-def type-id='b15bc960' size-in-bits='32' id='837c8b4a'/>
     <pointer-type-def type-id='1e7918a7' size-in-bits='32' id='047d4fff'/>
+    <pointer-type-def type-id='e11f28f2' size-in-bits='32' id='291f8894'/>
     <pointer-type-def type-id='eeed1f5d' size-in-bits='32' id='349a45dd'/>
+    <pointer-type-def type-id='cff016a0' size-in-bits='32' id='fb7cddfa'/>
     <pointer-type-def type-id='e53ab91c' size-in-bits='32' id='a5a1fc5a'/>
+    <pointer-type-def type-id='e7767992' size-in-bits='32' id='a247d414'/>
+    <pointer-type-def type-id='8fc602cf' size-in-bits='32' id='b4e3f2fb'/>
+    <pointer-type-def type-id='14b14180' size-in-bits='32' id='6a4b7aaa'/>
+    <pointer-type-def type-id='010ee697' size-in-bits='32' id='36621f5b'/>
     <pointer-type-def type-id='530c1a32' size-in-bits='32' id='76b5a6a0'/>
+    <pointer-type-def type-id='0227b7cb' size-in-bits='32' id='4441b0b7'/>
     <pointer-type-def type-id='2e67d715' size-in-bits='32' id='ee3187c5'/>
+    <pointer-type-def type-id='4221e479' size-in-bits='32' id='268a1fc5'/>
+    <pointer-type-def type-id='0d0538f2' size-in-bits='32' id='1408155c'/>
     <pointer-type-def type-id='a87003ef' size-in-bits='32' id='dda33667'/>
+    <pointer-type-def type-id='c3cab792' size-in-bits='32' id='5bbf72ec'/>
     <pointer-type-def type-id='b0749e8e' size-in-bits='32' id='0faa6e74'/>
+    <pointer-type-def type-id='9dadd0af' size-in-bits='32' id='4e1a93c3'/>
     <pointer-type-def type-id='fb46a283' size-in-bits='32' id='15b6e673'/>
+    <pointer-type-def type-id='c2b8dc36' size-in-bits='32' id='389a57a0'/>
     <pointer-type-def type-id='d988e2e8' size-in-bits='32' id='b09bab5e'/>
+    <pointer-type-def type-id='855cee92' size-in-bits='32' id='e787d4e4'/>
+    <pointer-type-def type-id='215c6e3b' size-in-bits='32' id='133c13b7'/>
     <pointer-type-def type-id='baffb083' size-in-bits='32' id='478e3663'/>
+    <pointer-type-def type-id='76521db1' size-in-bits='32' id='4dd53dc5'/>
+    <pointer-type-def type-id='98bd8c47' size-in-bits='32' id='3da870f3'/>
+    <pointer-type-def type-id='64eeac8a' size-in-bits='32' id='3c391da4'/>
+    <pointer-type-def type-id='69002c5c' size-in-bits='32' id='cb260be6'/>
+    <pointer-type-def type-id='ad610557' size-in-bits='32' id='aaa7cbbb'/>
+    <pointer-type-def type-id='8065ca7b' size-in-bits='32' id='f6c19e77'/>
+    <pointer-type-def type-id='20b53d0a' size-in-bits='32' id='0bf53c2c'/>
+    <pointer-type-def type-id='11384920' size-in-bits='32' id='510ae83a'/>
+    <pointer-type-def type-id='986d17a4' size-in-bits='32' id='26376bee'/>
+    <pointer-type-def type-id='0331d4f3' size-in-bits='32' id='e8958f4f'/>
+    <pointer-type-def type-id='7f2b3de2' size-in-bits='32' id='c5c23b24'/>
+    <pointer-type-def type-id='1c07a57e' size-in-bits='32' id='c4e4e430'/>
+    <pointer-type-def type-id='d3039ad1' size-in-bits='32' id='6ea5e66d'/>
+    <pointer-type-def type-id='5347fa1e' size-in-bits='32' id='886195f8'/>
+    <pointer-type-def type-id='ce48ca6b' size-in-bits='32' id='e3a17ed7'/>
+    <pointer-type-def type-id='80a2281d' size-in-bits='32' id='e49a4e19'/>
+    <pointer-type-def type-id='af76bbd1' size-in-bits='32' id='c011502d'/>
     <pointer-type-def type-id='fdf9f098' size-in-bits='32' id='14c7458e'/>
+    <pointer-type-def type-id='e4c39128' size-in-bits='32' id='1665dab2'/>
     <pointer-type-def type-id='30a4d497' size-in-bits='32' id='3239e3af'/>
+    <pointer-type-def type-id='4312461a' size-in-bits='32' id='e57ddc44'/>
     <pointer-type-def type-id='ae6a1c55' size-in-bits='32' id='e65fd0e5'/>
+    <pointer-type-def type-id='bf8b79fb' size-in-bits='32' id='629338b7'/>
+    <pointer-type-def type-id='6a61bc51' size-in-bits='32' id='081e36ed'/>
     <pointer-type-def type-id='07f10124' size-in-bits='32' id='a5fd6882'/>
+    <pointer-type-def type-id='e13d7981' size-in-bits='32' id='b3dfc495'/>
     <pointer-type-def type-id='27450c90' size-in-bits='32' id='a39ba61d'/>
     <reference-type-def kind='lvalue' type-id='663ed4a0' size-in-bits='32' id='4b4fe04a'/>
     <pointer-type-def type-id='663ed4a0' size-in-bits='32' id='3f4fcd66'/>
@@ -5040,9 +5077,53 @@
     <qualified-type-def type-id='c523b9f1' const='yes' id='effb3702'/>
     <pointer-type-def type-id='effb3702' size-in-bits='32' id='f077d3f8'/>
     <pointer-type-def type-id='f077d3f8' size-in-bits='32' id='5ea27396'/>
+    <pointer-type-def type-id='751bbba0' size-in-bits='32' id='b2550e7a'/>
+    <pointer-type-def type-id='3d193fe7' size-in-bits='32' id='e020195b'/>
+    <pointer-type-def type-id='e8eae280' size-in-bits='32' id='8c402bb2'/>
+    <pointer-type-def type-id='c1c06b31' size-in-bits='32' id='b353f23d'/>
+    <pointer-type-def type-id='48fdf325' size-in-bits='32' id='0bd83281'/>
+    <pointer-type-def type-id='96b697f2' size-in-bits='32' id='69f1a17c'/>
+    <pointer-type-def type-id='208d4eb7' size-in-bits='32' id='80ea0533'/>
+    <pointer-type-def type-id='9484a943' size-in-bits='32' id='3a07cbbf'/>
+    <pointer-type-def type-id='c5334730' size-in-bits='32' id='462f7efa'/>
+    <pointer-type-def type-id='e0a266ff' size-in-bits='32' id='c1b190ab'/>
+    <pointer-type-def type-id='f7adc4e6' size-in-bits='32' id='2e12dc68'/>
+    <pointer-type-def type-id='7fa34897' size-in-bits='32' id='d85ab86b'/>
+    <pointer-type-def type-id='2bedc155' size-in-bits='32' id='2b8d1ec9'/>
+    <pointer-type-def type-id='9847645e' size-in-bits='32' id='416b80c0'/>
+    <pointer-type-def type-id='2ba43f31' size-in-bits='32' id='758e6965'/>
+    <pointer-type-def type-id='afc30ad4' size-in-bits='32' id='ae1447d6'/>
+    <pointer-type-def type-id='dd0ce0d2' size-in-bits='32' id='5cc6425c'/>
+    <pointer-type-def type-id='e7a956c5' size-in-bits='32' id='429f9ec1'/>
+    <pointer-type-def type-id='2aaa6670' size-in-bits='32' id='9c2a8c9a'/>
+    <pointer-type-def type-id='b9a2936c' size-in-bits='32' id='03d8b5a6'/>
+    <pointer-type-def type-id='96b1521b' size-in-bits='32' id='85bd6b6f'/>
+    <pointer-type-def type-id='b3455944' size-in-bits='32' id='ec4dcb46'/>
+    <pointer-type-def type-id='3ced74dd' size-in-bits='32' id='ae148f89'/>
     <reference-type-def kind='lvalue' type-id='a6c45d85' size-in-bits='32' id='2a1f6799'/>
     <pointer-type-def type-id='a6c45d85' size-in-bits='32' id='361f7a7d'/>
     <pointer-type-def type-id='e322b6ef' size-in-bits='32' id='c5f12884'/>
+    <pointer-type-def type-id='f68d4a05' size-in-bits='32' id='18d755d9'/>
+    <pointer-type-def type-id='2fb8ba3e' size-in-bits='32' id='a65198e8'/>
+    <pointer-type-def type-id='fd01ee73' size-in-bits='32' id='1f46a8b7'/>
+    <pointer-type-def type-id='4039aa84' size-in-bits='32' id='6f79c54e'/>
+    <pointer-type-def type-id='aac1adbe' size-in-bits='32' id='a3c133e0'/>
+    <pointer-type-def type-id='97ac77f1' size-in-bits='32' id='cf5d6c0d'/>
+    <pointer-type-def type-id='701071ea' size-in-bits='32' id='9ef1ec6c'/>
+    <pointer-type-def type-id='7f4628e5' size-in-bits='32' id='670a3f71'/>
+    <pointer-type-def type-id='5a3b7732' size-in-bits='32' id='661ce4cc'/>
+    <pointer-type-def type-id='f4082a77' size-in-bits='32' id='08d19343'/>
+    <pointer-type-def type-id='badbb20f' size-in-bits='32' id='5496326b'/>
+    <pointer-type-def type-id='bf2f3ff3' size-in-bits='32' id='c21036b7'/>
+    <pointer-type-def type-id='b02ad03f' size-in-bits='32' id='9a705913'/>
+    <pointer-type-def type-id='585e26a8' size-in-bits='32' id='5452a27a'/>
+    <pointer-type-def type-id='bcbfbc79' size-in-bits='32' id='a9da4265'/>
+    <pointer-type-def type-id='90ae06f5' size-in-bits='32' id='6ebc9001'/>
+    <pointer-type-def type-id='cfb6b57e' size-in-bits='32' id='df4df828'/>
+    <pointer-type-def type-id='cfb63111' size-in-bits='32' id='2af90a7d'/>
+    <pointer-type-def type-id='08289274' size-in-bits='32' id='d6261a6e'/>
+    <pointer-type-def type-id='81c093cd' size-in-bits='32' id='6c0b3361'/>
+    <pointer-type-def type-id='7cae5494' size-in-bits='32' id='9a1d84ce'/>
     <pointer-type-def type-id='96ee24a5' size-in-bits='32' id='585e1de9'/>
     <reference-type-def kind='lvalue' type-id='95e97e5e' size-in-bits='32' id='769216e8'/>
     <pointer-type-def type-id='95e97e5e' size-in-bits='32' id='7292109c'/>
@@ -5066,9 +5147,43 @@
     <pointer-type-def type-id='9a10f134' size-in-bits='32' id='aa210e95'/>
     <pointer-type-def type-id='da4ac88c' size-in-bits='32' id='5353c67e'/>
     <pointer-type-def type-id='e095c704' size-in-bits='32' id='b9c88d6a'/>
+    <pointer-type-def type-id='65ac402a' size-in-bits='32' id='6225d3ac'/>
+    <pointer-type-def type-id='eee53025' size-in-bits='32' id='d94e6db1'/>
+    <pointer-type-def type-id='4fa09cf2' size-in-bits='32' id='e448b98c'/>
+    <pointer-type-def type-id='b392f3b7' size-in-bits='32' id='3c4aa383'/>
+    <pointer-type-def type-id='02732cb3' size-in-bits='32' id='a2ff3a77'/>
+    <pointer-type-def type-id='1c3b64ff' size-in-bits='32' id='d684a7d3'/>
+    <pointer-type-def type-id='f189b9e8' size-in-bits='32' id='3eb668ba'/>
+    <pointer-type-def type-id='02f4e539' size-in-bits='32' id='5d6eec25'/>
+    <pointer-type-def type-id='3a3ee135' size-in-bits='32' id='086b6f41'/>
+    <pointer-type-def type-id='a329d5be' size-in-bits='32' id='41244068'/>
+    <pointer-type-def type-id='283ee8d1' size-in-bits='32' id='9b10843d'/>
+    <pointer-type-def type-id='1b6356b4' size-in-bits='32' id='bd6709ae'/>
     <pointer-type-def type-id='3d7d8cbf' size-in-bits='32' id='a68021ce'/>
     <pointer-type-def type-id='05d4c620' size-in-bits='32' id='b8263143'/>
     <pointer-type-def type-id='ad707ada' size-in-bits='32' id='e90c4311'/>
+    <pointer-type-def type-id='1125f2c8' size-in-bits='32' id='4aef27a2'/>
+    <pointer-type-def type-id='4dff45bf' size-in-bits='32' id='501077b3'/>
+    <pointer-type-def type-id='3f815828' size-in-bits='32' id='5fd19dda'/>
+    <pointer-type-def type-id='d9279df9' size-in-bits='32' id='3ae45885'/>
+    <pointer-type-def type-id='7eebb2fd' size-in-bits='32' id='308377d9'/>
+    <pointer-type-def type-id='24c696da' size-in-bits='32' id='2626b4e4'/>
+    <pointer-type-def type-id='42bf5bbf' size-in-bits='32' id='f7df945b'/>
+    <pointer-type-def type-id='889ad70b' size-in-bits='32' id='c8f8ae67'/>
+    <pointer-type-def type-id='6e2e3468' size-in-bits='32' id='d9767672'/>
+    <pointer-type-def type-id='c050b627' size-in-bits='32' id='dd929613'/>
+    <pointer-type-def type-id='4bde468e' size-in-bits='32' id='072ec070'/>
+    <pointer-type-def type-id='0e846d7b' size-in-bits='32' id='fe0f389f'/>
+    <pointer-type-def type-id='4715bbb8' size-in-bits='32' id='c6a8fada'/>
+    <pointer-type-def type-id='dcb9a1d7' size-in-bits='32' id='a8ca014b'/>
+    <pointer-type-def type-id='307626fe' size-in-bits='32' id='26dda748'/>
+    <pointer-type-def type-id='4ceb2960' size-in-bits='32' id='2b203982'/>
+    <pointer-type-def type-id='43cf01cf' size-in-bits='32' id='6cb0cfc3'/>
+    <pointer-type-def type-id='e56709b6' size-in-bits='32' id='888e2c20'/>
+    <pointer-type-def type-id='7d91d8aa' size-in-bits='32' id='83e3c684'/>
+    <pointer-type-def type-id='cd21e8a5' size-in-bits='32' id='5a3ae4f9'/>
+    <pointer-type-def type-id='d7754972' size-in-bits='32' id='2b49d1c4'/>
+    <pointer-type-def type-id='fe80b037' size-in-bits='32' id='40bf8efb'/>
     <pointer-type-def type-id='b59d7dce' size-in-bits='32' id='78c01427'/>
     <reference-type-def kind='lvalue' type-id='60f5da7d' size-in-bits='32' id='809cbcf9'/>
     <reference-type-def kind='rvalue' type-id='60f5da7d' size-in-bits='32' id='55bd530d'/>
@@ -5625,153 +5740,37 @@
     <reference-type-def kind='lvalue' type-id='814fe063' size-in-bits='32' id='747a3607'/>
     <pointer-type-def type-id='c9d12d66' size-in-bits='32' id='b2eb2c3f'/>
     <pointer-type-def type-id='dddf6ca2' size-in-bits='32' id='d915a820'/>
-    <pointer-type-def type-id='59ed1e59' size-in-bits='32' id='5796afad'/>
-    <pointer-type-def type-id='a1390ee9' size-in-bits='32' id='f39f8bbd'/>
-    <pointer-type-def type-id='7be75d9e' size-in-bits='32' id='4127a730'/>
-    <pointer-type-def type-id='554d87f1' size-in-bits='32' id='339f696d'/>
-    <pointer-type-def type-id='6da5b67e' size-in-bits='32' id='412650f8'/>
-    <pointer-type-def type-id='1a9d598b' size-in-bits='32' id='916299d7'/>
-    <pointer-type-def type-id='6935722a' size-in-bits='32' id='bcee08ac'/>
-    <pointer-type-def type-id='4dd30b7b' size-in-bits='32' id='fb38167f'/>
-    <pointer-type-def type-id='96fb4d64' size-in-bits='32' id='ff535cb6'/>
-    <pointer-type-def type-id='6b6501bd' size-in-bits='32' id='f1191df9'/>
-    <pointer-type-def type-id='bed9a8c1' size-in-bits='32' id='13196dfd'/>
-    <pointer-type-def type-id='0ccd5902' size-in-bits='32' id='74823d0c'/>
-    <pointer-type-def type-id='b7d01ad5' size-in-bits='32' id='88d99751'/>
-    <pointer-type-def type-id='2b209300' size-in-bits='32' id='461c5f2a'/>
-    <pointer-type-def type-id='3b720171' size-in-bits='32' id='782c53f5'/>
-    <pointer-type-def type-id='aca2cd7e' size-in-bits='32' id='162473c8'/>
-    <pointer-type-def type-id='8e80bdd8' size-in-bits='32' id='c404650a'/>
-    <pointer-type-def type-id='3eafa32f' size-in-bits='32' id='db28fdcb'/>
-    <pointer-type-def type-id='148c6738' size-in-bits='32' id='478facc2'/>
-    <pointer-type-def type-id='e6efff49' size-in-bits='32' id='ce9d67cd'/>
-    <pointer-type-def type-id='fe213acd' size-in-bits='32' id='1d2f8a91'/>
-    <pointer-type-def type-id='ca62bfca' size-in-bits='32' id='1930d02c'/>
-    <pointer-type-def type-id='b142692f' size-in-bits='32' id='377b5e63'/>
-    <pointer-type-def type-id='4142d35b' size-in-bits='32' id='c8bc780f'/>
-    <pointer-type-def type-id='ed5f0798' size-in-bits='32' id='ed0795aa'/>
-    <pointer-type-def type-id='d664a6f7' size-in-bits='32' id='44bea17b'/>
-    <pointer-type-def type-id='e0efb9de' size-in-bits='32' id='17d955f8'/>
-    <pointer-type-def type-id='8f71b7e8' size-in-bits='32' id='be49c182'/>
-    <pointer-type-def type-id='db9b93fa' size-in-bits='32' id='0736b484'/>
-    <pointer-type-def type-id='b6d76995' size-in-bits='32' id='692552f9'/>
-    <pointer-type-def type-id='e5e01142' size-in-bits='32' id='dddcefc4'/>
-    <pointer-type-def type-id='2987b0c7' size-in-bits='32' id='3bd86cfb'/>
-    <pointer-type-def type-id='ab5a280f' size-in-bits='32' id='c2280e7b'/>
-    <pointer-type-def type-id='b10103d8' size-in-bits='32' id='c32cfa12'/>
-    <pointer-type-def type-id='07f91629' size-in-bits='32' id='63f7d65d'/>
-    <pointer-type-def type-id='57aaeac5' size-in-bits='32' id='239d7ad9'/>
-    <pointer-type-def type-id='85d5402e' size-in-bits='32' id='b0061f70'/>
-    <pointer-type-def type-id='8833c461' size-in-bits='32' id='d31f1c35'/>
-    <pointer-type-def type-id='4e7eaf04' size-in-bits='32' id='e747dee6'/>
-    <pointer-type-def type-id='717ad472' size-in-bits='32' id='ac74c0c4'/>
-    <pointer-type-def type-id='e1e0781a' size-in-bits='32' id='e905d0ac'/>
-    <pointer-type-def type-id='2f03f5b7' size-in-bits='32' id='3358ddb3'/>
-    <pointer-type-def type-id='b3b907e8' size-in-bits='32' id='93737cc2'/>
-    <pointer-type-def type-id='caf8409f' size-in-bits='32' id='b5f4f133'/>
-    <pointer-type-def type-id='ed3044e3' size-in-bits='32' id='bd4849d7'/>
-    <pointer-type-def type-id='126e53d0' size-in-bits='32' id='df8dc702'/>
-    <pointer-type-def type-id='dad530df' size-in-bits='32' id='be0ed943'/>
-    <pointer-type-def type-id='9539c406' size-in-bits='32' id='04b3e5a0'/>
-    <pointer-type-def type-id='a8186878' size-in-bits='32' id='a937264a'/>
-    <pointer-type-def type-id='2f0b7817' size-in-bits='32' id='0e5e0cdb'/>
-    <pointer-type-def type-id='b7e7edbe' size-in-bits='32' id='2dcc8b98'/>
-    <pointer-type-def type-id='a4a61472' size-in-bits='32' id='47bc557c'/>
-    <pointer-type-def type-id='837777dd' size-in-bits='32' id='a3ea0661'/>
-    <pointer-type-def type-id='2f02ea7a' size-in-bits='32' id='95fba39c'/>
-    <pointer-type-def type-id='461d0e9f' size-in-bits='32' id='a642a393'/>
-    <pointer-type-def type-id='dc0b1ac7' size-in-bits='32' id='31ebf17b'/>
-    <pointer-type-def type-id='fea2690f' size-in-bits='32' id='5d99509b'/>
-    <pointer-type-def type-id='14c3a3b0' size-in-bits='32' id='04aa9df2'/>
-    <pointer-type-def type-id='41b981f8' size-in-bits='32' id='337e1672'/>
-    <pointer-type-def type-id='88f16d4f' size-in-bits='32' id='caa57963'/>
-    <pointer-type-def type-id='02a81098' size-in-bits='32' id='87e0b5ea'/>
-    <pointer-type-def type-id='1dba3069' size-in-bits='32' id='4ed90115'/>
-    <pointer-type-def type-id='3197286d' size-in-bits='32' id='a0bc56e9'/>
-    <pointer-type-def type-id='413b072a' size-in-bits='32' id='8c4e1254'/>
-    <pointer-type-def type-id='1cd86ccf' size-in-bits='32' id='eb164d0b'/>
-    <pointer-type-def type-id='16cc647b' size-in-bits='32' id='06fbd437'/>
-    <pointer-type-def type-id='b9c972b8' size-in-bits='32' id='413559e2'/>
-    <pointer-type-def type-id='fba5b0d7' size-in-bits='32' id='9ac8b1e3'/>
-    <pointer-type-def type-id='757515fe' size-in-bits='32' id='e8139a80'/>
-    <pointer-type-def type-id='cd5e6e48' size-in-bits='32' id='69b7386a'/>
-    <pointer-type-def type-id='06074860' size-in-bits='32' id='4b15419a'/>
-    <pointer-type-def type-id='50ce2e7b' size-in-bits='32' id='5a4c25bf'/>
-    <pointer-type-def type-id='fcac2709' size-in-bits='32' id='9447819d'/>
-    <pointer-type-def type-id='1d639c93' size-in-bits='32' id='764ac7bf'/>
-    <pointer-type-def type-id='c12bf182' size-in-bits='32' id='0571aa74'/>
-    <pointer-type-def type-id='21fee85f' size-in-bits='32' id='771014ab'/>
-    <pointer-type-def type-id='83574fe4' size-in-bits='32' id='30b9a8ce'/>
-    <pointer-type-def type-id='dd7295b3' size-in-bits='32' id='0323d66f'/>
-    <pointer-type-def type-id='4a42a622' size-in-bits='32' id='64ca4b84'/>
-    <pointer-type-def type-id='f4d3e94e' size-in-bits='32' id='9aeb7958'/>
-    <pointer-type-def type-id='47891898' size-in-bits='32' id='67a46ff2'/>
-    <pointer-type-def type-id='42337f0c' size-in-bits='32' id='3318dad6'/>
-    <pointer-type-def type-id='968ef04b' size-in-bits='32' id='d5b0b547'/>
-    <pointer-type-def type-id='b2cf38da' size-in-bits='32' id='ce1853bc'/>
-    <pointer-type-def type-id='533df676' size-in-bits='32' id='f7e564c8'/>
-    <pointer-type-def type-id='66c316f9' size-in-bits='32' id='6c56e815'/>
-    <pointer-type-def type-id='4bcddb36' size-in-bits='32' id='66ebe6b0'/>
-    <pointer-type-def type-id='becc7143' size-in-bits='32' id='3271bf2f'/>
-    <pointer-type-def type-id='0149d965' size-in-bits='32' id='4a0b9bf1'/>
-    <pointer-type-def type-id='31d87a2b' size-in-bits='32' id='2041a8d7'/>
-    <pointer-type-def type-id='467aaa2c' size-in-bits='32' id='a4a6a786'/>
-    <pointer-type-def type-id='56c055db' size-in-bits='32' id='1fda464f'/>
-    <pointer-type-def type-id='8c344f84' size-in-bits='32' id='60306f66'/>
-    <pointer-type-def type-id='5d529e9d' size-in-bits='32' id='8c22ffe9'/>
-    <pointer-type-def type-id='a017e9d1' size-in-bits='32' id='47653e05'/>
-    <pointer-type-def type-id='82d29439' size-in-bits='32' id='326df5b5'/>
-    <pointer-type-def type-id='4aec61f6' size-in-bits='32' id='a60dd490'/>
-    <pointer-type-def type-id='18caaa83' size-in-bits='32' id='3459b4cf'/>
-    <pointer-type-def type-id='98f7aa67' size-in-bits='32' id='ac4e6cb3'/>
-    <pointer-type-def type-id='ee0744fc' size-in-bits='32' id='a55b35a6'/>
-    <pointer-type-def type-id='4890b95b' size-in-bits='32' id='5f929ab7'/>
-    <pointer-type-def type-id='b01f64aa' size-in-bits='32' id='ea8867ec'/>
-    <pointer-type-def type-id='9441d304' size-in-bits='32' id='d7ea3436'/>
-    <pointer-type-def type-id='1ab7137e' size-in-bits='32' id='30974818'/>
-    <pointer-type-def type-id='7a6fe7df' size-in-bits='32' id='09176273'/>
-    <pointer-type-def type-id='38d85c8f' size-in-bits='32' id='151a1d63'/>
-    <pointer-type-def type-id='41301cf9' size-in-bits='32' id='d7560895'/>
-    <pointer-type-def type-id='f341e414' size-in-bits='32' id='58398eee'/>
-    <pointer-type-def type-id='21042e4a' size-in-bits='32' id='f0a0ff54'/>
-    <pointer-type-def type-id='67748225' size-in-bits='32' id='582ba311'/>
-    <pointer-type-def type-id='e612672d' size-in-bits='32' id='a01a6e09'/>
-    <pointer-type-def type-id='1f8f9f18' size-in-bits='32' id='f8af7982'/>
-    <pointer-type-def type-id='2e613a3e' size-in-bits='32' id='a0ba6dc8'/>
-    <pointer-type-def type-id='7f8ca3fe' size-in-bits='32' id='34c67260'/>
-    <pointer-type-def type-id='bf1e0391' size-in-bits='32' id='15887ec5'/>
-    <pointer-type-def type-id='ae2834f4' size-in-bits='32' id='4f7677f6'/>
-    <pointer-type-def type-id='6c431008' size-in-bits='32' id='7139225a'/>
-    <pointer-type-def type-id='e24417ff' size-in-bits='32' id='4278623b'/>
-    <pointer-type-def type-id='b66924e8' size-in-bits='32' id='0290ef52'/>
-    <pointer-type-def type-id='d776b039' size-in-bits='32' id='2dab161d'/>
-    <pointer-type-def type-id='6ab04463' size-in-bits='32' id='0ae13aef'/>
-    <pointer-type-def type-id='ef48369b' size-in-bits='32' id='2c684c9f'/>
-    <pointer-type-def type-id='38edd3d4' size-in-bits='32' id='e4f2ab66'/>
-    <pointer-type-def type-id='e8f54abb' size-in-bits='32' id='500eebf7'/>
-    <pointer-type-def type-id='dc1ed48c' size-in-bits='32' id='0d5970ee'/>
-    <pointer-type-def type-id='0ed3c13b' size-in-bits='32' id='097c7407'/>
-    <pointer-type-def type-id='da5acea4' size-in-bits='32' id='d1173c4e'/>
-    <pointer-type-def type-id='307d2c7d' size-in-bits='32' id='362e2831'/>
-    <pointer-type-def type-id='3fa8e199' size-in-bits='32' id='f4bbad8d'/>
-    <pointer-type-def type-id='5e933196' size-in-bits='32' id='255ff5d8'/>
-    <pointer-type-def type-id='90c673e3' size-in-bits='32' id='0de4af77'/>
-    <pointer-type-def type-id='49617147' size-in-bits='32' id='476f48bb'/>
-    <pointer-type-def type-id='e3e7515c' size-in-bits='32' id='5db5877e'/>
-    <pointer-type-def type-id='5ad5f77b' size-in-bits='32' id='5da2c37f'/>
-    <pointer-type-def type-id='f6de0a0a' size-in-bits='32' id='bf87e894'/>
-    <pointer-type-def type-id='558a0aa4' size-in-bits='32' id='978c735e'/>
-    <pointer-type-def type-id='5d4b6f06' size-in-bits='32' id='a23a76e0'/>
-    <pointer-type-def type-id='d318157e' size-in-bits='32' id='a7d6acc8'/>
-    <pointer-type-def type-id='4b5c8855' size-in-bits='32' id='691ba251'/>
-    <pointer-type-def type-id='7de99def' size-in-bits='32' id='40f183ab'/>
-    <pointer-type-def type-id='4bd440f5' size-in-bits='32' id='7fdf58e1'/>
-    <pointer-type-def type-id='3d8c391f' size-in-bits='32' id='03bcacf3'/>
     <pointer-type-def type-id='8f92235e' size-in-bits='32' id='90421557'/>
+    <pointer-type-def type-id='c2ab665d' size-in-bits='32' id='22b63871'/>
+    <pointer-type-def type-id='099e830d' size-in-bits='32' id='20c24fe1'/>
+    <pointer-type-def type-id='68923e02' size-in-bits='32' id='ed8a4724'/>
+    <pointer-type-def type-id='c39bb24d' size-in-bits='32' id='39665099'/>
+    <pointer-type-def type-id='1590c34a' size-in-bits='32' id='d5caad24'/>
+    <pointer-type-def type-id='48fd5caf' size-in-bits='32' id='4be7351b'/>
+    <pointer-type-def type-id='4e0d6b36' size-in-bits='32' id='cfa619a8'/>
+    <pointer-type-def type-id='8c9e07a7' size-in-bits='32' id='58b3ba9b'/>
+    <pointer-type-def type-id='d3c3f6c0' size-in-bits='32' id='854f6072'/>
+    <pointer-type-def type-id='ca610cf1' size-in-bits='32' id='1e0ea67d'/>
+    <pointer-type-def type-id='6758006d' size-in-bits='32' id='db9229f9'/>
+    <pointer-type-def type-id='3f3fcf26' size-in-bits='32' id='61421910'/>
+    <pointer-type-def type-id='8c60d829' size-in-bits='32' id='71bf1195'/>
+    <pointer-type-def type-id='23a76bac' size-in-bits='32' id='03bc2706'/>
+    <pointer-type-def type-id='4124e285' size-in-bits='32' id='3d0f6989'/>
     <reference-type-def kind='lvalue' type-id='002ac4a6' size-in-bits='32' id='c3535580'/>
     <reference-type-def kind='rvalue' type-id='002ac4a6' size-in-bits='32' id='222fd452'/>
     <reference-type-def kind='lvalue' type-id='f0981eeb' size-in-bits='32' id='8c787cb7'/>
     <pointer-type-def type-id='f0981eeb' size-in-bits='32' id='807869d3'/>
+    <pointer-type-def type-id='1ecdf72d' size-in-bits='32' id='56968229'/>
+    <pointer-type-def type-id='1d1024e6' size-in-bits='32' id='cdfaa320'/>
+    <pointer-type-def type-id='3e594669' size-in-bits='32' id='a6dba205'/>
+    <pointer-type-def type-id='7410246c' size-in-bits='32' id='07b74db6'/>
+    <pointer-type-def type-id='68797c1a' size-in-bits='32' id='faf16cbc'/>
+    <pointer-type-def type-id='db7c949d' size-in-bits='32' id='1655d561'/>
+    <pointer-type-def type-id='52668408' size-in-bits='32' id='c569ef7a'/>
+    <pointer-type-def type-id='95a642e4' size-in-bits='32' id='d162eb86'/>
+    <pointer-type-def type-id='59b54183' size-in-bits='32' id='422f8a4f'/>
+    <pointer-type-def type-id='ffa18e9c' size-in-bits='32' id='9f915366'/>
+    <pointer-type-def type-id='c1dde4f5' size-in-bits='32' id='103c63e9'/>
     <pointer-type-def type-id='ee076206' size-in-bits='32' id='953b12f8'/>
     <pointer-type-def type-id='03e3ce24' size-in-bits='32' id='8bc971a6'/>
     <pointer-type-def type-id='a1159711' size-in-bits='32' id='2deb20e5'/>
@@ -17404,1006 +17403,1001 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <function-type size-in-bits='32' id='055a6f41'>
+    <function-type size-in-bits='32' id='b15bc960'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='5b7c7bab'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='80f4b756'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='e825b06b'/>
     </function-type>
-    <function-type size-in-bits='32' id='b3d5cbab'>
+    <function-type size-in-bits='32' id='e11f28f2'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='5b7c7bab'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='3b4676f4'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='61dc2b35'/>
     </function-type>
-    <function-type size-in-bits='32' id='96ee24a5'>
-      <parameter type-id='eaa32e2f'/>
-      <parameter type-id='eaa32e2f'/>
-      <return type-id='95e97e5e'/>
+    <function-type size-in-bits='32' id='cff016a0'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='088b642f'/>
     </function-type>
-    <function-type size-in-bits='32' id='6b5c9008'>
+    <function-type size-in-bits='32' id='e7767992'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='e825b06b'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='d4a328b7'/>
+      <parameter type-id='80f4b756'/>
+      <return type-id='70de5c42'/>
     </function-type>
-    <function-type size-in-bits='32' id='223133a2'>
+    <function-type size-in-bits='32' id='8fc602cf'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='61dc2b35'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='a6979e77'/>
+      <parameter type-id='80f4b756'/>
+      <parameter type-id='96f3d089'/>
+      <parameter type-id='a8d5bec6'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='70de5c42'/>
     </function-type>
-    <function-type size-in-bits='32' id='995d71ea'>
+    <function-type size-in-bits='32' id='14b14180'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='088b642f'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='071e4e5d'/>
+      <parameter type-id='70de5c42'/>
+      <return type-id='70de5c42'/>
     </function-type>
-    <function-type size-in-bits='32' id='f5043860'>
+    <function-type size-in-bits='32' id='010ee697'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='feee141c'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='6292c81e'/>
+      <parameter type-id='96f3d089'/>
+      <return type-id='70de5c42'/>
     </function-type>
-    <function-type size-in-bits='32' id='84110544'>
+    <function-type size-in-bits='32' id='0227b7cb'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='6e9854cd'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='d8263a65'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='feee141c'/>
     </function-type>
-    <function-type size-in-bits='32' id='6878e9a8'>
+    <function-type size-in-bits='32' id='4221e479'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='181f4ac0'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='7f83e8c4'/>
+      <parameter type-id='70de5c42'/>
+      <parameter type-id='80f4b756'/>
+      <parameter type-id='80f4b756'/>
+      <return type-id='1f3810cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='02c4e402'>
+    <function-type size-in-bits='32' id='0d0538f2'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='b43b1271'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='c2fb5303'/>
+      <parameter type-id='96f3d089'/>
+      <return type-id='1f3810cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='da4ac88c'>
+    <function-type size-in-bits='32' id='c3cab792'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='152bf3a9'/>
-      <parameter type-id='d4a328b7'/>
-      <return type-id='aa210e95'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='6e9854cd'/>
     </function-type>
-    <function-type size-in-bits='32' id='59ed1e59'>
+    <function-type size-in-bits='32' id='9dadd0af'>
       <parameter type-id='fae49a1f'/>
-      <return type-id='cc6e09ca'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='181f4ac0'/>
+    </function-type>
+    <function-type size-in-bits='32' id='c2b8dc36'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='b43b1271'/>
     </function-type>
-    <function-type size-in-bits='32' id='a1390ee9'>
+    <function-type size-in-bits='32' id='855cee92'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
+      <parameter type-id='80f4b756'/>
+      <parameter type-id='80f4b756'/>
+      <return type-id='38565182'/>
+    </function-type>
+    <function-type size-in-bits='32' id='215c6e3b'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='96f3d089'/>
+      <return type-id='38565182'/>
+    </function-type>
+    <function-type size-in-bits='32' id='76521db1'>
+      <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='7be75d9e'>
+    <function-type size-in-bits='32' id='98bd8c47'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
+    </function-type>
+    <function-type size-in-bits='32' id='64eeac8a'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='70de5c42'/>
+      <parameter type-id='1f3810cb'/>
+      <parameter type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='554d87f1'>
+    <function-type size-in-bits='32' id='69002c5c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
+    </function-type>
+    <function-type size-in-bits='32' id='ad610557'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='70de5c42'/>
+      <parameter type-id='38565182'/>
+      <parameter type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='6da5b67e'>
+    <function-type size-in-bits='32' id='8065ca7b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='1a9d598b'>
+    <function-type size-in-bits='32' id='20b53d0a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='6935722a'>
+    <function-type size-in-bits='32' id='11384920'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
-      <parameter type-id='70de5c42'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='4dd30b7b'>
+    <function-type size-in-bits='32' id='986d17a4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='96fb4d64'>
+    <function-type size-in-bits='32' id='0331d4f3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='6b6501bd'>
+    <function-type size-in-bits='32' id='7f2b3de2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='bed9a8c1'>
+    <function-type size-in-bits='32' id='1c07a57e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='0ccd5902'>
+    <function-type size-in-bits='32' id='d3039ad1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='b7d01ad5'>
+    <function-type size-in-bits='32' id='5347fa1e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='2b209300'>
+    <function-type size-in-bits='32' id='ce48ca6b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='3b720171'>
+    <function-type size-in-bits='32' id='80a2281d'>
       <parameter type-id='fae49a1f'/>
+      <parameter type-id='2d5e6f72'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='96f3d089'/>
+    </function-type>
+    <function-type size-in-bits='32' id='af76bbd1'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='c8745fdc'/>
+      <return type-id='96f3d089'/>
+    </function-type>
+    <function-type size-in-bits='32' id='e4c39128'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='2c2f1adb'/>
+      <parameter type-id='70de5c42'/>
       <parameter type-id='96f3d089'/>
-      <parameter type-id='96f3d089'/>
-      <return type-id='cc6e09ca'/>
+      <return type-id='2d5e6f72'/>
     </function-type>
-    <function-type size-in-bits='32' id='aca2cd7e'>
+    <function-type size-in-bits='32' id='4312461a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
-      <return type-id='e825b06b'/>
+      <return type-id='152bf3a9'/>
+    </function-type>
+    <function-type size-in-bits='32' id='bf8b79fb'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='80f4b756'/>
+      <return type-id='5b7c7bab'/>
     </function-type>
-    <function-type size-in-bits='32' id='8e80bdd8'>
+    <function-type size-in-bits='32' id='6a61bc51'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='3b4676f4'/>
+      <parameter type-id='2c2f1adb'/>
+      <return type-id='5b7c7bab'/>
+    </function-type>
+    <function-type size-in-bits='32' id='e13d7981'>
+      <parameter type-id='fae49a1f'/>
+      <return type-id='5b89f496'/>
+    </function-type>
+    <function-type size-in-bits='32' id='055a6f41'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='5b7c7bab'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='80f4b756'/>
+    </function-type>
+    <function-type size-in-bits='32' id='b3d5cbab'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='5b7c7bab'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='3b4676f4'/>
+    </function-type>
+    <function-type size-in-bits='32' id='751bbba0'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='3eafa32f'>
+    <function-type size-in-bits='32' id='3d193fe7'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='148c6738'>
+    <function-type size-in-bits='32' id='e8eae280'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='e6efff49'>
+    <function-type size-in-bits='32' id='c1c06b31'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='fe213acd'>
+    <function-type size-in-bits='32' id='48fdf325'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='ca62bfca'>
+    <function-type size-in-bits='32' id='96b697f2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='b142692f'>
+    <function-type size-in-bits='32' id='208d4eb7'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='4142d35b'>
+    <function-type size-in-bits='32' id='9484a943'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='ed5f0798'>
+    <function-type size-in-bits='32' id='c5334730'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='d664a6f7'>
+    <function-type size-in-bits='32' id='e0a266ff'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='e0efb9de'>
+    <function-type size-in-bits='32' id='f7adc4e6'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='adf18958'/>
+      <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='8f71b7e8'>
+    <function-type size-in-bits='32' id='7fa34897'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='61dc2b35'/>
+      <parameter type-id='96f3d089'/>
+      <return type-id='c36bf49e'/>
     </function-type>
-    <function-type size-in-bits='32' id='db9b93fa'>
+    <function-type size-in-bits='32' id='2bedc155'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='b6d76995'>
+    <function-type size-in-bits='32' id='9847645e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='e5e01142'>
+    <function-type size-in-bits='32' id='2ba43f31'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='2987b0c7'>
+    <function-type size-in-bits='32' id='afc30ad4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='ab5a280f'>
+    <function-type size-in-bits='32' id='dd0ce0d2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='b10103d8'>
+    <function-type size-in-bits='32' id='e7a956c5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='07f91629'>
+    <function-type size-in-bits='32' id='2aaa6670'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='57aaeac5'>
+    <function-type size-in-bits='32' id='b9a2936c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='85d5402e'>
+    <function-type size-in-bits='32' id='96b1521b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='8833c461'>
+    <function-type size-in-bits='32' id='b3455944'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='4e7eaf04'>
+    <function-type size-in-bits='32' id='3ced74dd'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='8dfe2e06'/>
+      <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='717ad472'>
+    <function-type size-in-bits='32' id='f68d4a05'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='088b642f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='e1e0781a'>
+    <function-type size-in-bits='32' id='2fb8ba3e'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='80f4b756'/>
-      <return type-id='70de5c42'/>
+      <parameter type-id='17ed04c8'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f03f5b7'>
+    <function-type size-in-bits='32' id='fd01ee73'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='80f4b756'/>
-      <parameter type-id='96f3d089'/>
-      <parameter type-id='a8d5bec6'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='70de5c42'/>
+      <parameter type-id='65b69bb3'/>
+      <return type-id='2c2f1adb'/>
     </function-type>
-    <function-type size-in-bits='32' id='b3b907e8'>
+    <function-type size-in-bits='32' id='4039aa84'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
-      <return type-id='70de5c42'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='caf8409f'>
+    <function-type size-in-bits='32' id='aac1adbe'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='96f3d089'/>
-      <return type-id='70de5c42'/>
+      <parameter type-id='70de5c42'/>
+      <parameter type-id='8ec52105'/>
+      <parameter type-id='0b9c02cb'/>
+      <return type-id='0b9c02cb'/>
+    </function-type>
+    <function-type size-in-bits='32' id='97ac77f1'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='70de5c42'/>
+      <parameter type-id='80f4b756'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='ed3044e3'>
+    <function-type size-in-bits='32' id='701071ea'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='126e53d0'>
+    <function-type size-in-bits='32' id='7f4628e5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='dad530df'>
+    <function-type size-in-bits='32' id='5a3b7732'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='9539c406'>
+    <function-type size-in-bits='32' id='f4082a77'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
+    </function-type>
+    <function-type size-in-bits='32' id='badbb20f'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='0b9c02cb'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='a8186878'>
+    <function-type size-in-bits='32' id='bf2f3ff3'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='96f3d089'/>
+      <return type-id='0b9c02cb'/>
+    </function-type>
+    <function-type size-in-bits='32' id='b02ad03f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f0b7817'>
+    <function-type size-in-bits='32' id='585e26a8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='b7e7edbe'>
+    <function-type size-in-bits='32' id='bcbfbc79'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='a4a61472'>
+    <function-type size-in-bits='32' id='90ae06f5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='837777dd'>
+    <function-type size-in-bits='32' id='cfb6b57e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f02ea7a'>
+    <function-type size-in-bits='32' id='cfb63111'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='461d0e9f'>
+    <function-type size-in-bits='32' id='08289274'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='973e3c3f'/>
+      <return type-id='0b9c02cb'/>
+    </function-type>
+    <function-type size-in-bits='32' id='81c093cd'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='5b7c7bab'/>
+      <return type-id='2c2f1adb'/>
+    </function-type>
+    <function-type size-in-bits='32' id='7cae5494'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='5b89f496'/>
+      <return type-id='0b9c02cb'/>
+    </function-type>
+    <function-type size-in-bits='32' id='96ee24a5'>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='eaa32e2f'/>
+      <return type-id='95e97e5e'/>
+    </function-type>
+    <function-type size-in-bits='32' id='6b5c9008'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='e825b06b'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='d4a328b7'/>
+    </function-type>
+    <function-type size-in-bits='32' id='223133a2'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='61dc2b35'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='a6979e77'/>
+    </function-type>
+    <function-type size-in-bits='32' id='995d71ea'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='088b642f'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='071e4e5d'/>
+    </function-type>
+    <function-type size-in-bits='32' id='f5043860'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='feee141c'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='6292c81e'/>
+    </function-type>
+    <function-type size-in-bits='32' id='84110544'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='6e9854cd'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='d8263a65'/>
     </function-type>
-    <function-type size-in-bits='32' id='dc0b1ac7'>
+    <function-type size-in-bits='32' id='6878e9a8'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='feee141c'/>
+      <parameter type-id='181f4ac0'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='7f83e8c4'/>
     </function-type>
-    <function-type size-in-bits='32' id='fea2690f'>
+    <function-type size-in-bits='32' id='02c4e402'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='70de5c42'/>
-      <parameter type-id='80f4b756'/>
-      <parameter type-id='80f4b756'/>
-      <return type-id='1f3810cb'/>
+      <parameter type-id='b43b1271'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='c2fb5303'/>
     </function-type>
-    <function-type size-in-bits='32' id='14c3a3b0'>
+    <function-type size-in-bits='32' id='da4ac88c'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='96f3d089'/>
-      <return type-id='1f3810cb'/>
+      <parameter type-id='152bf3a9'/>
+      <parameter type-id='d4a328b7'/>
+      <return type-id='aa210e95'/>
     </function-type>
-    <function-type size-in-bits='32' id='41b981f8'>
+    <function-type size-in-bits='32' id='65ac402a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='88f16d4f'>
+    <function-type size-in-bits='32' id='eee53025'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='02a81098'>
+    <function-type size-in-bits='32' id='4fa09cf2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='1dba3069'>
+    <function-type size-in-bits='32' id='b392f3b7'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
+    </function-type>
+    <function-type size-in-bits='32' id='02732cb3'>
+      <parameter type-id='fae49a1f'/>
+      <parameter type-id='96f3d089'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='3197286d'>
+    <function-type size-in-bits='32' id='1c3b64ff'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='413b072a'>
+    <function-type size-in-bits='32' id='f189b9e8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='1cd86ccf'>
+    <function-type size-in-bits='32' id='02f4e539'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='16cc647b'>
+    <function-type size-in-bits='32' id='3a3ee135'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='b9c972b8'>
+    <function-type size-in-bits='32' id='a329d5be'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='fba5b0d7'>
+    <function-type size-in-bits='32' id='283ee8d1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='1a7fe6b0'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='757515fe'>
+    <function-type size-in-bits='32' id='1b6356b4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='1a7fe6b0'/>
-    </function-type>
-    <function-type size-in-bits='32' id='cd5e6e48'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='6e9854cd'/>
-    </function-type>
-    <function-type size-in-bits='32' id='06074860'>
-      <parameter type-id='fae49a1f'/>
-      <return type-id='0b9c02cb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='50ce2e7b'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='17ed04c8'/>
-      <return type-id='0b9c02cb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='fcac2709'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='70de5c42'/>
-      <return type-id='0b9c02cb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='1d639c93'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='70de5c42'/>
-      <parameter type-id='8ec52105'/>
-      <parameter type-id='0b9c02cb'/>
-      <return type-id='0b9c02cb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='c12bf182'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='70de5c42'/>
-      <parameter type-id='80f4b756'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='21fee85f'>
+    <function-type size-in-bits='32' id='1125f2c8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='83574fe4'>
+    <function-type size-in-bits='32' id='4dff45bf'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='dd7295b3'>
+    <function-type size-in-bits='32' id='3f815828'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='4a42a622'>
+    <function-type size-in-bits='32' id='d9279df9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='0b9c02cb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='f4d3e94e'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='0b9c02cb'/>
-      <return type-id='0b9c02cb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='47891898'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='96f3d089'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='42337f0c'>
+    <function-type size-in-bits='32' id='7eebb2fd'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='968ef04b'>
+    <function-type size-in-bits='32' id='24c696da'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='b2cf38da'>
+    <function-type size-in-bits='32' id='42bf5bbf'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='533df676'>
+    <function-type size-in-bits='32' id='889ad70b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='66c316f9'>
+    <function-type size-in-bits='32' id='6e2e3468'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='4bcddb36'>
+    <function-type size-in-bits='32' id='c050b627'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='0b9c02cb'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='becc7143'>
+    <function-type size-in-bits='32' id='4bde468e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='0b9c02cb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='0149d965'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='5b89f496'/>
-      <return type-id='0b9c02cb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='31d87a2b'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='181f4ac0'/>
+      <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='467aaa2c'>
+    <function-type size-in-bits='32' id='0e846d7b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='56c055db'>
+    <function-type size-in-bits='32' id='4715bbb8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='8c344f84'>
+    <function-type size-in-bits='32' id='dcb9a1d7'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='5d529e9d'>
+    <function-type size-in-bits='32' id='307626fe'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='c8745fdc'/>
-    </function-type>
-    <function-type size-in-bits='32' id='a017e9d1'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='96f3d089'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='82d29439'>
+    <function-type size-in-bits='32' id='4ceb2960'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='4aec61f6'>
+    <function-type size-in-bits='32' id='43cf01cf'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='18caaa83'>
+    <function-type size-in-bits='32' id='e56709b6'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='98f7aa67'>
+    <function-type size-in-bits='32' id='7d91d8aa'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='ee0744fc'>
+    <function-type size-in-bits='32' id='cd21e8a5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='4890b95b'>
+    <function-type size-in-bits='32' id='d7754972'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='c8745fdc'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='b01f64aa'>
+    <function-type size-in-bits='32' id='fe80b037'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='c8745fdc'/>
-    </function-type>
-    <function-type size-in-bits='32' id='9441d304'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='b43b1271'/>
-    </function-type>
-    <function-type size-in-bits='32' id='1ab7137e'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='70de5c42'/>
-      <parameter type-id='80f4b756'/>
-      <parameter type-id='80f4b756'/>
-      <return type-id='38565182'/>
+      <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='7a6fe7df'>
+    <function-type size-in-bits='32' id='c2ab665d'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='96f3d089'/>
-      <return type-id='38565182'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='38d85c8f'>
+    <function-type size-in-bits='32' id='099e830d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
-      <return type-id='96f3d089'/>
-    </function-type>
-    <function-type size-in-bits='32' id='41301cf9'>
-      <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
-      <parameter type-id='1f3810cb'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='f341e414'>
+    <function-type size-in-bits='32' id='68923e02'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <parameter type-id='cc6e09ca'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='21042e4a'>
+    <function-type size-in-bits='32' id='c39bb24d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='96f3d089'/>
-    </function-type>
-    <function-type size-in-bits='32' id='67748225'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='70de5c42'/>
-      <parameter type-id='38565182'/>
-      <parameter type-id='cc6e09ca'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='e612672d'>
+    <function-type size-in-bits='32' id='1590c34a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='1f8f9f18'>
+    <function-type size-in-bits='32' id='48fd5caf'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='2e613a3e'>
+    <function-type size-in-bits='32' id='4e0d6b36'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
-      <return type-id='96f3d089'/>
+      <parameter type-id='70de5c42'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='7f8ca3fe'>
+    <function-type size-in-bits='32' id='8c9e07a7'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='bf1e0391'>
+    <function-type size-in-bits='32' id='d3c3f6c0'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='ae2834f4'>
+    <function-type size-in-bits='32' id='ca610cf1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='6c431008'>
+    <function-type size-in-bits='32' id='6758006d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='e24417ff'>
+    <function-type size-in-bits='32' id='3f3fcf26'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='b66924e8'>
+    <function-type size-in-bits='32' id='8c60d829'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='d776b039'>
+    <function-type size-in-bits='32' id='23a76bac'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='96f3d089'/>
-    </function-type>
-    <function-type size-in-bits='32' id='6ab04463'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='2d5e6f72'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='96f3d089'/>
-    </function-type>
-    <function-type size-in-bits='32' id='ef48369b'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='eaa32e2f'/>
-      <parameter type-id='c8745fdc'/>
-      <return type-id='96f3d089'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='38edd3d4'>
+    <function-type size-in-bits='32' id='4124e285'>
       <parameter type-id='fae49a1f'/>
-      <parameter type-id='2c2f1adb'/>
-      <parameter type-id='70de5c42'/>
       <parameter type-id='96f3d089'/>
-      <return type-id='2d5e6f72'/>
-    </function-type>
-    <function-type size-in-bits='32' id='e8f54abb'>
-      <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
-      <return type-id='c36bf49e'/>
+      <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='dc1ed48c'>
+    <function-type size-in-bits='32' id='1ecdf72d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='0ed3c13b'>
+    <function-type size-in-bits='32' id='1d1024e6'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='da5acea4'>
+    <function-type size-in-bits='32' id='3e594669'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='307d2c7d'>
+    <function-type size-in-bits='32' id='7410246c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='3fa8e199'>
+    <function-type size-in-bits='32' id='68797c1a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='5e933196'>
+    <function-type size-in-bits='32' id='db7c949d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='90c673e3'>
+    <function-type size-in-bits='32' id='52668408'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='49617147'>
+    <function-type size-in-bits='32' id='95a642e4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='e3e7515c'>
+    <function-type size-in-bits='32' id='59b54183'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='5ad5f77b'>
+    <function-type size-in-bits='32' id='ffa18e9c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
-      <return type-id='9a10f134'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='f6de0a0a'>
+    <function-type size-in-bits='32' id='c1dde4f5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
-      <return type-id='9a10f134'/>
-    </function-type>
-    <function-type size-in-bits='32' id='558a0aa4'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='152bf3a9'/>
-    </function-type>
-    <function-type size-in-bits='32' id='5d4b6f06'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='65b69bb3'/>
-      <return type-id='2c2f1adb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='d318157e'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='5b7c7bab'/>
-      <return type-id='2c2f1adb'/>
-    </function-type>
-    <function-type size-in-bits='32' id='4b5c8855'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='80f4b756'/>
-      <return type-id='5b7c7bab'/>
-    </function-type>
-    <function-type size-in-bits='32' id='7de99def'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='3b4676f4'/>
-      <parameter type-id='2c2f1adb'/>
-      <return type-id='5b7c7bab'/>
-    </function-type>
-    <function-type size-in-bits='32' id='4bd440f5'>
-      <parameter type-id='fae49a1f'/>
-      <return type-id='5b89f496'/>
-    </function-type>
-    <function-type size-in-bits='32' id='3d8c391f'>
-      <parameter type-id='fae49a1f'/>
-      <parameter type-id='96f3d089'/>
-      <return type-id='6c9a8402'/>
+      <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='03e3ce24'>
       <parameter type-id='fae49a1f'/>

diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index ad7e8e6e2ddaa1e0df15f278da362915228dc401..f71d5c88c09e02930ad2cf102d2d0c2d56bd13d2 100644 (file)
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -6760,13 +6760,9 @@
     <pointer-type-def type-id='type-id-786' size-in-bits='64' id='type-id-787'/>
     <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-789'/>
     <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-790'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-791'/>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-792'/>
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-381'/>
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-793'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-794'/>
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-795'/>
-    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-796'/>
+    <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-792'/>
+    <pointer-type-def type-id='type-id-793' size-in-bits='64' id='type-id-794'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-796'/>
     <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-798'/>
     <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-800'/>
     <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
@@ -6777,32 +6773,36 @@
     <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
     <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-814'/>
     <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-816'/>
-    <pointer-type-def type-id='type-id-817' size-in-bits='64' id='type-id-818'/>
-    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-820'/>
-    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-822'/>
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-824'/>
-    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
-    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-828'/>
-    <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-830'/>
-    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-832'/>
-    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-834'/>
-    <pointer-type-def type-id='type-id-835' size-in-bits='64' id='type-id-836'/>
-    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-838'/>
-    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-840'/>
-    <pointer-type-def type-id='type-id-841' size-in-bits='64' id='type-id-842'/>
-    <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-844'/>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-845'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-817'/>
+    <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-819'/>
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-820'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-821'/>
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-823'/>
+    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-824'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-825'/>
+    <pointer-type-def type-id='type-id-826' size-in-bits='64' id='type-id-827'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-828' size-in-bits='64' id='type-id-829'/>
+    <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-831'/>
+    <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-833'/>
+    <pointer-type-def type-id='type-id-834' size-in-bits='64' id='type-id-835'/>
+    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-837'/>
+    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-839'/>
+    <pointer-type-def type-id='type-id-840' size-in-bits='64' id='type-id-841'/>
+    <pointer-type-def type-id='type-id-842' size-in-bits='64' id='type-id-843'/>
+    <pointer-type-def type-id='type-id-844' size-in-bits='64' id='type-id-845'/>
     <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-847'/>
     <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-849'/>
     <pointer-type-def type-id='type-id-850' size-in-bits='64' id='type-id-851'/>
     <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-853'/>
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-855'/>
     <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-127'/>
+    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-855'/>
     <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-857'/>
     <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-859'/>
-    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-861'/>
     <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-218'/>
+    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-861'/>
     <pointer-type-def type-id='type-id-862' size-in-bits='64' id='type-id-389'/>
     <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-864'/>
     <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-866'/>
@@ -7203,7 +7203,7 @@
       <parameter type-id='type-id-403' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='read_f' type-id='type-id-830' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' id='type-id-912'/>
+    <typedef-decl name='read_f' type-id='type-id-808' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' id='type-id-912'/>
     <function-decl name='__interceptor_pread' mangled-name='__interceptor_pread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1'/>
@@ -7211,7 +7211,7 @@
       <parameter type-id='type-id-901' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='pread_f' type-id='type-id-834' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' id='type-id-913'/>
+    <typedef-decl name='pread_f' type-id='type-id-812' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' id='type-id-913'/>
     <function-decl name='__interceptor_pread64' mangled-name='__interceptor_pread64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread64'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
@@ -7219,14 +7219,14 @@
       <parameter type-id='type-id-903' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='pread64_f' type-id='type-id-832' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' id='type-id-914'/>
+    <typedef-decl name='pread64_f' type-id='type-id-810' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' id='type-id-914'/>
     <function-decl name='__interceptor_readv' mangled-name='__interceptor_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readv'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <parameter type-id='type-id-465' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <parameter type-id='type-id-4' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='readv_f' type-id='type-id-820' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' id='type-id-915'/>
+    <typedef-decl name='readv_f' type-id='type-id-796' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' id='type-id-915'/>
     <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <parameter type-id='type-id-465' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
@@ -7234,7 +7234,7 @@
       <parameter type-id='type-id-901' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='preadv_f' type-id='type-id-824' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' id='type-id-916'/>
+    <typedef-decl name='preadv_f' type-id='type-id-800' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' id='type-id-916'/>
     <function-decl name='__interceptor_preadv64' mangled-name='__interceptor_preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv64'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <parameter type-id='type-id-465' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
@@ -7242,14 +7242,14 @@
       <parameter type-id='type-id-903' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='preadv64_f' type-id='type-id-822' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' id='type-id-917'/>
+    <typedef-decl name='preadv64_f' type-id='type-id-798' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' id='type-id-917'/>
     <function-decl name='__interceptor_write' mangled-name='__interceptor_write' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_write'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <parameter type-id='type-id-403' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='write_f' type-id='type-id-830' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' id='type-id-918'/>
+    <typedef-decl name='write_f' type-id='type-id-808' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' id='type-id-918'/>
     <function-decl name='__interceptor_pwrite' mangled-name='__interceptor_pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
@@ -7257,7 +7257,7 @@
       <parameter type-id='type-id-901' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='pwrite_f' type-id='type-id-834' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' id='type-id-919'/>
+    <typedef-decl name='pwrite_f' type-id='type-id-812' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' id='type-id-919'/>
     <function-decl name='__interceptor_pwrite64' mangled-name='__interceptor_pwrite64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite64'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
@@ -7265,14 +7265,14 @@
       <parameter type-id='type-id-903' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='pwrite64_f' type-id='type-id-828' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' id='type-id-920'/>
+    <typedef-decl name='pwrite64_f' type-id='type-id-806' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' id='type-id-920'/>
     <function-decl name='__interceptor_writev' mangled-name='__interceptor_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_writev'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <parameter type-id='type-id-465' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <parameter type-id='type-id-4' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='writev_f' type-id='type-id-820' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' id='type-id-921'/>
+    <typedef-decl name='writev_f' type-id='type-id-796' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' id='type-id-921'/>
     <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-465' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
@@ -7280,7 +7280,7 @@
       <parameter type-id='type-id-901' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='pwritev_f' type-id='type-id-824' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' id='type-id-922'/>
+    <typedef-decl name='pwritev_f' type-id='type-id-800' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' id='type-id-922'/>
     <function-decl name='__interceptor_pwritev64' mangled-name='__interceptor_pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev64'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <parameter type-id='type-id-465' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
@@ -7288,7 +7288,7 @@
       <parameter type-id='type-id-903' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='pwritev64_f' type-id='type-id-822' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' id='type-id-923'/>
+    <typedef-decl name='pwritev64_f' type-id='type-id-798' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' id='type-id-923'/>
     <function-decl name='__interceptor_prctl' mangled-name='__interceptor_prctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_prctl'>
       <parameter type-id='type-id-4' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
       <parameter type-id='type-id-105' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
@@ -7302,7 +7302,7 @@
       <parameter type-id='type-id-127' name='t' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='432' column='1'/>
       <return type-id='type-id-105'/>
     </function-decl>
-    <typedef-decl name='time_f' type-id='type-id-855' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='432' column='1' id='type-id-925'/>
+    <typedef-decl name='time_f' type-id='type-id-841' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='432' column='1' id='type-id-925'/>
     <function-decl name='__interceptor_localtime' mangled-name='__interceptor_localtime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_localtime'>
       <parameter type-id='type-id-127' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1'/>
       <return type-id='type-id-481'/>
@@ -7356,41 +7356,41 @@
     <typedef-decl name='strptime_f' type-id='type-id-505' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1' id='type-id-934'/>
     <function-decl name='__interceptor_vscanf' mangled-name='__interceptor_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vscanf'>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <typedef-decl name='vscanf_f' type-id='type-id-651' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' id='type-id-935'/>
     <function-decl name='__interceptor_vsscanf' mangled-name='__interceptor_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vsscanf'>
       <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <typedef-decl name='vsscanf_f' type-id='type-id-643' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1' id='type-id-936'/>
     <function-decl name='__interceptor_vfscanf' mangled-name='__interceptor_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vfscanf'>
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <typedef-decl name='vfscanf_f' type-id='type-id-742' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' id='type-id-937'/>
     <function-decl name='__interceptor___isoc99_vscanf' mangled-name='__interceptor___isoc99_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vscanf'>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <typedef-decl name='__isoc99_vscanf_f' type-id='type-id-651' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' id='type-id-938'/>
     <function-decl name='__interceptor___isoc99_vsscanf' mangled-name='__interceptor___isoc99_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vsscanf'>
       <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <typedef-decl name='__isoc99_vsscanf_f' type-id='type-id-643' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' id='type-id-939'/>
     <function-decl name='__interceptor___isoc99_vfscanf' mangled-name='__interceptor___isoc99_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vfscanf'>
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
-      <parameter type-id='type-id-845' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
+      <parameter type-id='type-id-825' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <typedef-decl name='__isoc99_vfscanf_f' type-id='type-id-742' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' id='type-id-940'/>
@@ -7655,7 +7655,7 @@
       <parameter type-id='type-id-4' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='recvmsg_f' type-id='type-id-826' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' id='type-id-977'/>
+    <typedef-decl name='recvmsg_f' type-id='type-id-802' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' id='type-id-977'/>
     <function-decl name='__interceptor_getpeername' mangled-name='__interceptor_getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getpeername'>
       <parameter type-id='type-id-4' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
@@ -7699,7 +7699,7 @@
       <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1'/>
       <return type-id='type-id-91'/>
     </function-decl>
-    <typedef-decl name='ptrace_f' type-id='type-id-840' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' id='type-id-984'/>
+    <typedef-decl name='ptrace_f' type-id='type-id-839' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' id='type-id-984'/>
     <function-decl name='__interceptor_setlocale' mangled-name='__interceptor_setlocale' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setlocale'>
       <parameter type-id='type-id-4' name='category' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1'/>
       <parameter type-id='type-id-25' name='locale' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1'/>
@@ -7723,21 +7723,21 @@
       <parameter type-id='type-id-4' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
       <return type-id='type-id-900'/>
     </function-decl>
-    <typedef-decl name='strtoimax_f' type-id='type-id-798' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' id='type-id-988'/>
+    <typedef-decl name='strtoimax_f' type-id='type-id-819' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' id='type-id-988'/>
     <function-decl name='__interceptor_strtoumax' mangled-name='__interceptor_strtoumax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strtoumax'>
       <parameter type-id='type-id-2' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <parameter type-id='type-id-530' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <parameter type-id='type-id-4' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <return type-id='type-id-900'/>
     </function-decl>
-    <typedef-decl name='strtoumax_f' type-id='type-id-798' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' id='type-id-989'/>
+    <typedef-decl name='strtoumax_f' type-id='type-id-819' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' id='type-id-989'/>
     <function-decl name='__interceptor_mbstowcs' mangled-name='__interceptor_mbstowcs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mbstowcs'>
       <parameter type-id='type-id-896' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1'/>
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1'/>
       <parameter type-id='type-id-403' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
-    <typedef-decl name='mbstowcs_f' type-id='type-id-814' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1' id='type-id-990'/>
+    <typedef-decl name='mbstowcs_f' type-id='type-id-853' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1' id='type-id-990'/>
     <function-decl name='__interceptor_mbsrtowcs' mangled-name='__interceptor_mbsrtowcs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mbsrtowcs'>
       <parameter type-id='type-id-896' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1'/>
       <parameter type-id='type-id-343' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1'/>
@@ -7745,7 +7745,7 @@
       <parameter type-id='type-id-1' name='ps' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
-    <typedef-decl name='mbsrtowcs_f' type-id='type-id-812' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1' id='type-id-991'/>
+    <typedef-decl name='mbsrtowcs_f' type-id='type-id-851' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1' id='type-id-991'/>
     <function-decl name='__interceptor_mbsnrtowcs' mangled-name='__interceptor_mbsnrtowcs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mbsnrtowcs'>
       <parameter type-id='type-id-896' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1'/>
       <parameter type-id='type-id-343' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1'/>
@@ -7754,14 +7754,14 @@
       <parameter type-id='type-id-1' name='ps' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
-    <typedef-decl name='mbsnrtowcs_f' type-id='type-id-810' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1' id='type-id-992'/>
+    <typedef-decl name='mbsnrtowcs_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1' id='type-id-992'/>
     <function-decl name='__interceptor_wcstombs' mangled-name='__interceptor_wcstombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcstombs'>
       <parameter type-id='type-id-25' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <parameter type-id='type-id-568' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <parameter type-id='type-id-403' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
-    <typedef-decl name='wcstombs_f' type-id='type-id-804' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' id='type-id-993'/>
+    <typedef-decl name='wcstombs_f' type-id='type-id-833' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' id='type-id-993'/>
     <function-decl name='__interceptor_wcsrtombs' mangled-name='__interceptor_wcsrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsrtombs'>
       <parameter type-id='type-id-25' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <parameter type-id='type-id-569' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
@@ -7769,7 +7769,7 @@
       <parameter type-id='type-id-1' name='ps' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
-    <typedef-decl name='wcsrtombs_f' type-id='type-id-802' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' id='type-id-994'/>
+    <typedef-decl name='wcsrtombs_f' type-id='type-id-831' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' id='type-id-994'/>
     <function-decl name='__interceptor_wcsnrtombs' mangled-name='__interceptor_wcsnrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsnrtombs'>
       <parameter type-id='type-id-25' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <parameter type-id='type-id-569' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
@@ -7778,7 +7778,7 @@
       <parameter type-id='type-id-1' name='ps' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
-    <typedef-decl name='wcsnrtombs_f' type-id='type-id-800' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' id='type-id-995'/>
+    <typedef-decl name='wcsnrtombs_f' type-id='type-id-829' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' id='type-id-995'/>
     <function-decl name='__interceptor_tcgetattr' mangled-name='__interceptor_tcgetattr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tcgetattr'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1752' column='1'/>
       <parameter type-id='type-id-1' name='termios_p' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1752' column='1'/>
@@ -7802,7 +7802,7 @@
       <parameter type-id='type-id-403' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
-    <typedef-decl name='confstr_f' type-id='type-id-806' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' id='type-id-999'/>
+    <typedef-decl name='confstr_f' type-id='type-id-837' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' id='type-id-999'/>
     <function-decl name='__interceptor_sched_getaffinity' mangled-name='__interceptor_sched_getaffinity' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sched_getaffinity'>
       <parameter type-id='type-id-4' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
       <parameter type-id='type-id-403' name='cpusetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
@@ -8170,14 +8170,14 @@
       <parameter type-id='type-id-578' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <typedef-decl name='sincos_f' type-id='type-id-859' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1' id='type-id-1059'/>
+    <typedef-decl name='sincos_f' type-id='type-id-857' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1' id='type-id-1059'/>
     <function-decl name='__interceptor_sincosf' mangled-name='__interceptor_sincosf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sincosf'>
       <parameter type-id='type-id-357' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <parameter type-id='type-id-587' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <parameter type-id='type-id-587' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <typedef-decl name='sincosf_f' type-id='type-id-861' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' id='type-id-1060'/>
+    <typedef-decl name='sincosf_f' type-id='type-id-859' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' id='type-id-1060'/>
     <function-decl name='__interceptor_sincosl' mangled-name='__interceptor_sincosl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sincosl'>
       <parameter type-id='type-id-361' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
       <parameter type-id='type-id-790' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
@@ -8247,7 +8247,7 @@
     <typedef-decl name='drand48_r_f' type-id='type-id-746' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1' id='type-id-1071'/>
     <function-decl name='__interceptor_lrand48_r' mangled-name='__interceptor_lrand48_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_lrand48_r'>
       <parameter type-id='type-id-1' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
-      <parameter type-id='type-id-791' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
+      <parameter type-id='type-id-817' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <typedef-decl name='lrand48_r_f' type-id='type-id-756' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1' id='type-id-1072'/>
@@ -8257,7 +8257,7 @@
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='getline_f' type-id='type-id-818' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1' id='type-id-1073'/>
+    <typedef-decl name='getline_f' type-id='type-id-794' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1' id='type-id-1073'/>
     <function-decl name='__interceptor_getdelim' mangled-name='__interceptor_getdelim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getdelim'>
       <parameter type-id='type-id-530' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <parameter type-id='type-id-404' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
@@ -8265,7 +8265,7 @@
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <return type-id='type-id-898'/>
     </function-decl>
-    <typedef-decl name='getdelim_f' type-id='type-id-816' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' id='type-id-1074'/>
+    <typedef-decl name='getdelim_f' type-id='type-id-792' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' id='type-id-1074'/>
     <function-decl name='__interceptor_iconv' mangled-name='__interceptor_iconv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_iconv'>
       <parameter type-id='type-id-1' name='cd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <parameter type-id='type-id-530' name='inbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
@@ -8274,29 +8274,29 @@
       <parameter type-id='type-id-404' name='outbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <return type-id='type-id-403'/>
     </function-decl>
-    <typedef-decl name='iconv_f' type-id='type-id-808' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' id='type-id-1075'/>
+    <typedef-decl name='iconv_f' type-id='type-id-845' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' id='type-id-1075'/>
     <function-decl name='__interceptor_times' mangled-name='__interceptor_times' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_times'>
       <parameter type-id='type-id-1' name='tms' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1'/>
       <return type-id='type-id-1222'/>
     </function-decl>
-    <typedef-decl name='times_f' type-id='type-id-836' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' id='type-id-1076'/>
+    <typedef-decl name='times_f' type-id='type-id-816' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' id='type-id-1076'/>
     <typedef-decl name='kernel_sigset_t' type-id='type-id-24' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='130' column='1' id='type-id-559'/>
     <function-decl name='__sanitizer_syscall_pre_impl_recvmsg' mangled-name='__sanitizer_syscall_pre_impl_recvmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_recvmsg'>
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
-      <parameter type-id='type-id-794' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
+      <parameter type-id='type-id-822' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_recvmsg' mangled-name='__sanitizer_syscall_post_impl_recvmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_recvmsg'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
-      <parameter type-id='type-id-794' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
+      <parameter type-id='type-id-822' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='158' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_recvmmsg' mangled-name='__sanitizer_syscall_pre_impl_recvmmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_recvmmsg'>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
-      <parameter type-id='type-id-793' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
+      <parameter type-id='type-id-821' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='170' column='1'/>
       <parameter type-id='type-id-1' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='170' column='1'/>
@@ -8305,7 +8305,7 @@
     <function-decl name='__sanitizer_syscall_post_impl_recvmmsg' mangled-name='__sanitizer_syscall_post_impl_recvmmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_recvmmsg'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
-      <parameter type-id='type-id-793' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
+      <parameter type-id='type-id-821' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
       <parameter type-id='type-id-1' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
@@ -10716,46 +10716,46 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_bind' mangled-name='__sanitizer_syscall_pre_impl_bind' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_bind'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_bind' mangled-name='__sanitizer_syscall_post_impl_bind' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_bind'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1761' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_connect' mangled-name='__sanitizer_syscall_pre_impl_connect' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_connect'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_connect' mangled-name='__sanitizer_syscall_post_impl_connect' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_connect'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1770' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_accept' mangled-name='__sanitizer_syscall_pre_impl_accept' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_accept'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_accept' mangled-name='__sanitizer_syscall_post_impl_accept' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_accept'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1779' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_accept4' mangled-name='__sanitizer_syscall_pre_impl_accept4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_accept4'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1787' column='1'/>
       <return type-id='type-id-24'/>
@@ -10763,34 +10763,34 @@
     <function-decl name='__sanitizer_syscall_post_impl_accept4' mangled-name='__sanitizer_syscall_post_impl_accept4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_accept4'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1790' column='1'/>
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1790' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_getsockname' mangled-name='__sanitizer_syscall_pre_impl_getsockname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_getsockname'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1798' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_getsockname' mangled-name='__sanitizer_syscall_post_impl_getsockname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_getsockname'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1801' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_getpeername' mangled-name='__sanitizer_syscall_pre_impl_getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_getpeername'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1809' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_getpeername' mangled-name='__sanitizer_syscall_post_impl_getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_getpeername'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
-      <parameter type-id='type-id-795' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
+      <parameter type-id='type-id-823' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <parameter type-id='type-id-1' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1812' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
@@ -10814,7 +10814,7 @@
       <parameter type-id='type-id-1' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
-      <parameter type-id='type-id-795' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
+      <parameter type-id='type-id-823' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <parameter type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
@@ -10824,7 +10824,7 @@
       <parameter type-id='type-id-1' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
-      <parameter type-id='type-id-795' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
+      <parameter type-id='type-id-823' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <parameter type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
@@ -10875,7 +10875,7 @@
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
       <parameter type-id='type-id-41' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
-      <parameter type-id='type-id-795' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
+      <parameter type-id='type-id-823' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <parameter type-id='type-id-1' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
@@ -10885,7 +10885,7 @@
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
       <parameter type-id='type-id-41' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
-      <parameter type-id='type-id-795' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
+      <parameter type-id='type-id-823' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <parameter type-id='type-id-1' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
@@ -13083,7 +13083,7 @@
       <parameter type-id='type-id-160' name='sec' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1'/>
       <return type-id='type-id-160'/>
     </function-decl>
-    <typedef-decl name='sleep_f' type-id='type-id-853' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' id='type-id-1077'/>
+    <typedef-decl name='sleep_f' type-id='type-id-827' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' id='type-id-1077'/>
     <function-decl name='__interceptor_usleep' mangled-name='__interceptor_usleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_usleep'>
       <parameter type-id='type-id-1231' name='usec' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1'/>
       <return type-id='type-id-4'/>
@@ -13149,13 +13149,13 @@
       <parameter type-id='type-id-4' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <typedef-decl name='longjmp_f' type-id='type-id-857' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' id='type-id-1089'/>
+    <typedef-decl name='longjmp_f' type-id='type-id-855' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' id='type-id-1089'/>
     <function-decl name='__interceptor_siglongjmp' mangled-name='__interceptor_siglongjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_siglongjmp'>
       <parameter type-id='type-id-221' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
       <parameter type-id='type-id-4' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <typedef-decl name='siglongjmp_f' type-id='type-id-857' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' id='type-id-1090'/>
+    <typedef-decl name='siglongjmp_f' type-id='type-id-855' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' id='type-id-1090'/>
     <function-decl name='__interceptor_malloc' mangled-name='__interceptor_malloc' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='475' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_malloc'>
       <parameter type-id='type-id-91' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='475' column='1'/>
       <return type-id='type-id-1'/>
@@ -13193,7 +13193,7 @@
       <parameter type-id='type-id-1' name='p' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='541' column='1'/>
       <return type-id='type-id-91'/>
     </function-decl>
-    <typedef-decl name='malloc_usable_size_f' type-id='type-id-842' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='541' column='1' id='type-id-1097'/>
+    <typedef-decl name='malloc_usable_size_f' type-id='type-id-843' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='541' column='1' id='type-id-1097'/>
     <function-decl name='operator new' mangled-name='_Znwm' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znwm'>
       <parameter type-id='type-id-91' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='559' column='1'/>
       <return type-id='type-id-1'/>
@@ -13234,7 +13234,7 @@
       <parameter type-id='type-id-2' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='613' column='1'/>
       <return type-id='type-id-91'/>
     </function-decl>
-    <typedef-decl name='strlen_f' type-id='type-id-838' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='613' column='1' id='type-id-1098'/>
+    <typedef-decl name='strlen_f' type-id='type-id-835' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='613' column='1' id='type-id-1098'/>
     <function-decl name='__interceptor_memset' mangled-name='__interceptor_memset' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_memset'>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='620' column='1'/>
       <parameter type-id='type-id-4' name='v' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='620' column='1'/>
@@ -13793,14 +13793,14 @@
       <parameter type-id='type-id-4' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1'/>
       <return type-id='type-id-1231'/>
     </function-decl>
-    <typedef-decl name='send_f' type-id='type-id-849' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' id='type-id-1188'/>
+    <typedef-decl name='send_f' type-id='type-id-814' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' id='type-id-1188'/>
     <function-decl name='__interceptor_sendmsg' mangled-name='__interceptor_sendmsg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sendmsg'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <parameter type-id='type-id-1' name='msg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <parameter type-id='type-id-4' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <return type-id='type-id-1231'/>
     </function-decl>
-    <typedef-decl name='sendmsg_f' type-id='type-id-847' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' id='type-id-1189'/>
+    <typedef-decl name='sendmsg_f' type-id='type-id-804' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' id='type-id-1189'/>
     <function-decl name='__interceptor_recv' mangled-name='__interceptor_recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recv'>
       <parameter type-id='type-id-4' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
@@ -13808,7 +13808,7 @@
       <parameter type-id='type-id-4' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <return type-id='type-id-1231'/>
     </function-decl>
-    <typedef-decl name='recv_f' type-id='type-id-849' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' id='type-id-1190'/>
+    <typedef-decl name='recv_f' type-id='type-id-814' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' id='type-id-1190'/>
     <function-decl name='__interceptor_unlink' mangled-name='__interceptor_unlink' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_unlink'>
       <parameter type-id='type-id-25' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1'/>
       <return type-id='type-id-4'/>
@@ -13839,7 +13839,7 @@
       <parameter type-id='type-id-1' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1554' column='1'/>
       <return type-id='type-id-91'/>
     </function-decl>
-    <typedef-decl name='fread_f' type-id='type-id-844' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1554' column='1' id='type-id-1195'/>
+    <typedef-decl name='fread_f' type-id='type-id-847' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1554' column='1' id='type-id-1195'/>
     <function-decl name='__interceptor_fwrite' mangled-name='__interceptor_fwrite' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fwrite'>
       <parameter type-id='type-id-1' name='p' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1'/>
       <parameter type-id='type-id-91' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1'/>
@@ -13847,7 +13847,7 @@
       <parameter type-id='type-id-1' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1'/>
       <return type-id='type-id-91'/>
     </function-decl>
-    <typedef-decl name='fwrite_f' type-id='type-id-844' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' id='type-id-1196'/>
+    <typedef-decl name='fwrite_f' type-id='type-id-847' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' id='type-id-1196'/>
     <function-decl name='__interceptor_fflush' mangled-name='__interceptor_fflush' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fflush'>
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1'/>
       <return type-id='type-id-4'/>
@@ -13891,8 +13891,8 @@
     <typedef-decl name='epoll_wait_f' type-id='type-id-705' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' id='type-id-1203'/>
     <function-decl name='__interceptor_sigaction' mangled-name='__interceptor_sigaction' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigaction'>
       <parameter type-id='type-id-4' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
-      <parameter type-id='type-id-796' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
-      <parameter type-id='type-id-796' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-824' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-824' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <typedef-decl name='sigaction_f' type-id='type-id-691' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' id='type-id-1204'/>
@@ -13901,7 +13901,7 @@
       <parameter type-id='type-id-388' name='h' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1'/>
       <return type-id='type-id-388'/>
     </function-decl>
-    <typedef-decl name='signal_f' type-id='type-id-851' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' id='type-id-1205'/>
+    <typedef-decl name='signal_f' type-id='type-id-861' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' id='type-id-1205'/>
     <function-decl name='__interceptor_sigsuspend' mangled-name='__interceptor_sigsuspend' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsuspend'>
       <parameter type-id='type-id-554' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
       <return type-id='type-id-4'/>
@@ -14377,7 +14377,7 @@
     <function-type size-in-bits='64' id='type-id-642'>
       <parameter type-id='type-id-2' name='str'/>
       <parameter type-id='type-id-2' name='format'/>
-      <parameter type-id='type-id-845' name='ap'/>
+      <parameter type-id='type-id-825' name='ap'/>
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-644'>
@@ -14399,7 +14399,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-650'>
       <parameter type-id='type-id-2' name='format'/>
-      <parameter type-id='type-id-845' name='ap'/>
+      <parameter type-id='type-id-825' name='ap'/>
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-652'>
@@ -14515,8 +14515,8 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-690'>
       <parameter type-id='type-id-4' name='sig'/>
-      <parameter type-id='type-id-796' name='act'/>
-      <parameter type-id='type-id-796' name='old'/>
+      <parameter type-id='type-id-824' name='act'/>
+      <parameter type-id='type-id-824' name='old'/>
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-692'>
@@ -14659,7 +14659,7 @@
     <function-type size-in-bits='64' id='type-id-741'>
       <parameter type-id='type-id-1' name='stream'/>
       <parameter type-id='type-id-2' name='format'/>
-      <parameter type-id='type-id-845' name='ap'/>
+      <parameter type-id='type-id-825' name='ap'/>
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-743'>
@@ -14702,7 +14702,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-755'>
       <parameter type-id='type-id-1' name='buffer'/>
-      <parameter type-id='type-id-791' name='result'/>
+      <parameter type-id='type-id-817' name='result'/>
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-757'>
@@ -14789,202 +14789,202 @@
       <parameter type-id='type-id-33' name='quo'/>
       <return type-id='type-id-361'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-797'>
-      <parameter type-id='type-id-2' name='nptr'/>
-      <parameter type-id='type-id-530' name='endptr'/>
-      <parameter type-id='type-id-4' name='base'/>
-      <return type-id='type-id-900'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-799'>
-      <parameter type-id='type-id-25' name='dest'/>
-      <parameter type-id='type-id-569' name='src'/>
-      <parameter type-id='type-id-403' name='nms'/>
-      <parameter type-id='type-id-403' name='len'/>
-      <parameter type-id='type-id-1' name='ps'/>
-      <return type-id='type-id-403'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-801'>
-      <parameter type-id='type-id-25' name='dest'/>
-      <parameter type-id='type-id-569' name='src'/>
-      <parameter type-id='type-id-403' name='len'/>
-      <parameter type-id='type-id-1' name='ps'/>
-      <return type-id='type-id-403'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-803'>
-      <parameter type-id='type-id-25' name='dest'/>
-      <parameter type-id='type-id-568' name='src'/>
-      <parameter type-id='type-id-403' name='len'/>
-      <return type-id='type-id-403'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-805'>
-      <parameter type-id='type-id-4' name='name'/>
-      <parameter type-id='type-id-25' name='buf'/>
-      <parameter type-id='type-id-403' name='len'/>
-      <return type-id='type-id-403'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-807'>
-      <parameter type-id='type-id-1' name='cd'/>
-      <parameter type-id='type-id-530' name='inbuf'/>
-      <parameter type-id='type-id-404' name='inbytesleft'/>
-      <parameter type-id='type-id-530' name='outbuf'/>
-      <parameter type-id='type-id-404' name='outbytesleft'/>
-      <return type-id='type-id-403'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-809'>
-      <parameter type-id='type-id-896' name='dest'/>
-      <parameter type-id='type-id-343' name='src'/>
-      <parameter type-id='type-id-403' name='nms'/>
-      <parameter type-id='type-id-403' name='len'/>
-      <parameter type-id='type-id-1' name='ps'/>
-      <return type-id='type-id-403'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-811'>
-      <parameter type-id='type-id-896' name='dest'/>
-      <parameter type-id='type-id-343' name='src'/>
-      <parameter type-id='type-id-403' name='len'/>
-      <parameter type-id='type-id-1' name='ps'/>
-      <return type-id='type-id-403'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-813'>
-      <parameter type-id='type-id-896' name='dest'/>
-      <parameter type-id='type-id-2' name='src'/>
-      <parameter type-id='type-id-403' name='len'/>
-      <return type-id='type-id-403'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-815'>
+    <function-type size-in-bits='64' id='type-id-791'>
       <parameter type-id='type-id-530' name='lineptr'/>
       <parameter type-id='type-id-404' name='n'/>
       <parameter type-id='type-id-4' name='delim'/>
       <parameter type-id='type-id-1' name='stream'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-817'>
+    <function-type size-in-bits='64' id='type-id-793'>
       <parameter type-id='type-id-530' name='lineptr'/>
       <parameter type-id='type-id-404' name='n'/>
       <parameter type-id='type-id-1' name='stream'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-819'>
+    <function-type size-in-bits='64' id='type-id-795'>
       <parameter type-id='type-id-4' name='fd'/>
       <parameter type-id='type-id-465' name='iov'/>
       <parameter type-id='type-id-4' name='iovcnt'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-821'>
+    <function-type size-in-bits='64' id='type-id-797'>
       <parameter type-id='type-id-4' name='fd'/>
       <parameter type-id='type-id-465' name='iov'/>
       <parameter type-id='type-id-4' name='iovcnt'/>
       <parameter type-id='type-id-903' name='offset'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-823'>
+    <function-type size-in-bits='64' id='type-id-799'>
       <parameter type-id='type-id-4' name='fd'/>
       <parameter type-id='type-id-465' name='iov'/>
       <parameter type-id='type-id-4' name='iovcnt'/>
       <parameter type-id='type-id-901' name='offset'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-825'>
+    <function-type size-in-bits='64' id='type-id-801'>
       <parameter type-id='type-id-4' name='fd'/>
       <parameter type-id='type-id-474' name='msg'/>
       <parameter type-id='type-id-4' name='flags'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-827'>
+    <function-type size-in-bits='64' id='type-id-803'>
+      <parameter type-id='type-id-4' name='fd'/>
+      <parameter type-id='type-id-1' name='msg'/>
+      <parameter type-id='type-id-4' name='flags'/>
+      <return type-id='type-id-1231'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-805'>
       <parameter type-id='type-id-4' name='fd'/>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-903' name='count'/>
       <parameter type-id='type-id-903' name='offset'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-829'>
+    <function-type size-in-bits='64' id='type-id-807'>
       <parameter type-id='type-id-4' name='fd'/>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-403' name='count'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-831'>
+    <function-type size-in-bits='64' id='type-id-809'>
       <parameter type-id='type-id-4' name='fd'/>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-403' name='count'/>
       <parameter type-id='type-id-903' name='offset'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-833'>
+    <function-type size-in-bits='64' id='type-id-811'>
       <parameter type-id='type-id-4' name='fd'/>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-403' name='count'/>
       <parameter type-id='type-id-901' name='offset'/>
       <return type-id='type-id-898'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-835'>
+    <function-type size-in-bits='64' id='type-id-813'>
+      <parameter type-id='type-id-4' name='fd'/>
+      <parameter type-id='type-id-1' name='buf'/>
+      <parameter type-id='type-id-1231' name='len'/>
+      <parameter type-id='type-id-4' name='flags'/>
+      <return type-id='type-id-1231'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-815'>
       <parameter type-id='type-id-1' name='tms'/>
       <return type-id='type-id-1222'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-839'>
+    <function-type size-in-bits='64' id='type-id-818'>
+      <parameter type-id='type-id-2' name='nptr'/>
+      <parameter type-id='type-id-530' name='endptr'/>
+      <parameter type-id='type-id-4' name='base'/>
+      <return type-id='type-id-900'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-826'>
+      <parameter type-id='type-id-160' name='sec'/>
+      <return type-id='type-id-160'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-828'>
+      <parameter type-id='type-id-25' name='dest'/>
+      <parameter type-id='type-id-569' name='src'/>
+      <parameter type-id='type-id-403' name='nms'/>
+      <parameter type-id='type-id-403' name='len'/>
+      <parameter type-id='type-id-1' name='ps'/>
+      <return type-id='type-id-403'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-830'>
+      <parameter type-id='type-id-25' name='dest'/>
+      <parameter type-id='type-id-569' name='src'/>
+      <parameter type-id='type-id-403' name='len'/>
+      <parameter type-id='type-id-1' name='ps'/>
+      <return type-id='type-id-403'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-832'>
+      <parameter type-id='type-id-25' name='dest'/>
+      <parameter type-id='type-id-568' name='src'/>
+      <parameter type-id='type-id-403' name='len'/>
+      <return type-id='type-id-403'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-836'>
+      <parameter type-id='type-id-4' name='name'/>
+      <parameter type-id='type-id-25' name='buf'/>
+      <parameter type-id='type-id-403' name='len'/>
+      <return type-id='type-id-403'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-838'>
       <parameter type-id='type-id-4' name='request'/>
       <parameter type-id='type-id-4' name='pid'/>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-1' name='data'/>
       <return type-id='type-id-91'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-841'>
+    <function-type size-in-bits='64' id='type-id-840'>
+      <parameter type-id='type-id-127' name='t'/>
+      <return type-id='type-id-105'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-842'>
       <parameter type-id='type-id-1' name='p'/>
       <return type-id='type-id-91'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-843'>
+    <function-type size-in-bits='64' id='type-id-844'>
+      <parameter type-id='type-id-1' name='cd'/>
+      <parameter type-id='type-id-530' name='inbuf'/>
+      <parameter type-id='type-id-404' name='inbytesleft'/>
+      <parameter type-id='type-id-530' name='outbuf'/>
+      <parameter type-id='type-id-404' name='outbytesleft'/>
+      <return type-id='type-id-403'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-846'>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-91' name='size'/>
       <parameter type-id='type-id-91' name='nmemb'/>
       <parameter type-id='type-id-1' name='f'/>
       <return type-id='type-id-91'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-846'>
-      <parameter type-id='type-id-4' name='fd'/>
-      <parameter type-id='type-id-1' name='msg'/>
-      <parameter type-id='type-id-4' name='flags'/>
-      <return type-id='type-id-1231'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-848'>
-      <parameter type-id='type-id-4' name='fd'/>
-      <parameter type-id='type-id-1' name='buf'/>
-      <parameter type-id='type-id-1231' name='len'/>
-      <parameter type-id='type-id-4' name='flags'/>
-      <return type-id='type-id-1231'/>
+      <parameter type-id='type-id-896' name='dest'/>
+      <parameter type-id='type-id-343' name='src'/>
+      <parameter type-id='type-id-403' name='nms'/>
+      <parameter type-id='type-id-403' name='len'/>
+      <parameter type-id='type-id-1' name='ps'/>
+      <return type-id='type-id-403'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-850'>
-      <parameter type-id='type-id-4' name='sig'/>
-      <parameter type-id='type-id-388' name='h'/>
-      <return type-id='type-id-388'/>
+      <parameter type-id='type-id-896' name='dest'/>
+      <parameter type-id='type-id-343' name='src'/>
+      <parameter type-id='type-id-403' name='len'/>
+      <parameter type-id='type-id-1' name='ps'/>
+      <return type-id='type-id-403'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-852'>
-      <parameter type-id='type-id-160' name='sec'/>
-      <return type-id='type-id-160'/>
+      <parameter type-id='type-id-896' name='dest'/>
+      <parameter type-id='type-id-2' name='src'/>
+      <parameter type-id='type-id-403' name='len'/>
+      <return type-id='type-id-403'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-854'>
-      <parameter type-id='type-id-127' name='t'/>
-      <return type-id='type-id-105'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-856'>
       <parameter type-id='type-id-221' name='env'/>
       <parameter type-id='type-id-4' name='val'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-858'>
+    <function-type size-in-bits='64' id='type-id-856'>
       <parameter type-id='type-id-356' name='x'/>
       <parameter type-id='type-id-578' name='sin'/>
       <parameter type-id='type-id-578' name='cos'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-860'>
+    <function-type size-in-bits='64' id='type-id-858'>
       <parameter type-id='type-id-357' name='x'/>
       <parameter type-id='type-id-587' name='sin'/>
       <parameter type-id='type-id-587' name='cos'/>
       <return type-id='type-id-24'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-860'>
+      <parameter type-id='type-id-4' name='sig'/>
+      <parameter type-id='type-id-388' name='h'/>
+      <return type-id='type-id-388'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-862'>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-792'/>
+      <parameter type-id='type-id-820'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-24'/>
     </function-type>
@@ -15071,7 +15071,7 @@
       <parameter type-id='type-id-2' name='str'/>
       <return type-id='type-id-25'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-837'>
+    <function-type size-in-bits='64' id='type-id-834'>
       <parameter type-id='type-id-2' name='s'/>
       <return type-id='type-id-91'/>
     </function-type>

diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index 39201390437310b62f07ec4cc01c91c76db3ccb8..8e4d11b9350e6c5eee912b74fcd166cdd20fa7e2 100644 (file)
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -1830,9 +1830,9 @@
     <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-129'/>
     <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-131'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-136'/>
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-137'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-134'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-135'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-137'/>
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-139'/>
     <class-decl name='coibuffer' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-49'/>
     <class-decl name='coiengine' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-51'/>
@@ -1861,49 +1861,49 @@
     <typedef-decl name='COI_ACCESS_FLAGS' type-id='type-id-30' filepath='../../../gcc/liboffloadmic/include/coi/source/COIPipeline_source.h' line='97' column='1' id='type-id-69'/>
     <namespace-decl name='COI'>
       <var-decl name='is_available' type-id='type-id-144' mangled-name='_ZN3COI12is_availableE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='60' column='1'/>
-      <var-decl name='EngineGetCount' type-id='type-id-123' mangled-name='_ZN3COI14EngineGetCountE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='63' column='1'/>
-      <var-decl name='EngineGetHandle' type-id='type-id-121' mangled-name='_ZN3COI15EngineGetHandleE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='64' column='1'/>
-      <var-decl name='ProcessCreateFromMemory' type-id='type-id-95' mangled-name='_ZN3COI23ProcessCreateFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='66' column='1'/>
-      <var-decl name='ProcessCreateFromFile' type-id='type-id-93' mangled-name='_ZN3COI21ProcessCreateFromFileE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='74' column='1'/>
-      <var-decl name='ProcessSetCacheSize' type-id='type-id-115' mangled-name='_ZN3COI19ProcessSetCacheSizeE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='82' column='1'/>
-      <var-decl name='ProcessDestroy' type-id='type-id-109' mangled-name='_ZN3COI14ProcessDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='85' column='1'/>
-      <var-decl name='ProcessGetFunctionHandles' type-id='type-id-111' mangled-name='_ZN3COI25ProcessGetFunctionHandlesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='87' column='1'/>
-      <var-decl name='ProcessLoadLibraryFromMemory' type-id='type-id-119' mangled-name='_ZN3COI28ProcessLoadLibraryFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='90' column='1'/>
-      <var-decl name='ProcessUnloadLibrary' type-id='type-id-107' mangled-name='_ZN3COI20ProcessUnloadLibraryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='100' column='1'/>
-      <var-decl name='ProcessRegisterLibraries' type-id='type-id-127' mangled-name='_ZN3COI24ProcessRegisterLibrariesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='103' column='1'/>
-      <var-decl name='PipelineCreate' type-id='type-id-117' mangled-name='_ZN3COI14PipelineCreateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='109' column='1'/>
-      <var-decl name='PipelineDestroy' type-id='type-id-103' mangled-name='_ZN3COI15PipelineDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='111' column='1'/>
-      <var-decl name='PipelineRunFunction' type-id='type-id-105' mangled-name='_ZN3COI19PipelineRunFunctionE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='112' column='1'/>
-      <var-decl name='BufferCreate' type-id='type-id-131' mangled-name='_ZN3COI12BufferCreateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='119' column='1'/>
-      <var-decl name='BufferCreateFromMemory' type-id='type-id-131' mangled-name='_ZN3COI22BufferCreateFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='122' column='1'/>
-      <var-decl name='BufferDestroy' type-id='type-id-77' mangled-name='_ZN3COI13BufferDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='126' column='1'/>
-      <var-decl name='BufferMap' type-id='type-id-85' mangled-name='_ZN3COI9BufferMapE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='127' column='1'/>
-      <var-decl name='BufferUnmap' type-id='type-id-101' mangled-name='_ZN3COI11BufferUnmapE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='130' column='1'/>
-      <var-decl name='BufferWrite' type-id='type-id-87' mangled-name='_ZN3COI11BufferWriteE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='132' column='1'/>
-      <var-decl name='BufferRead' type-id='type-id-87' mangled-name='_ZN3COI10BufferReadE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='135' column='1'/>
-      <var-decl name='BufferReadMultiD' type-id='type-id-89' mangled-name='_ZN3COI16BufferReadMultiDE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='138' column='1'/>
-      <var-decl name='BufferWriteMultiD' type-id='type-id-83' mangled-name='_ZN3COI17BufferWriteMultiDE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='141' column='1'/>
-      <var-decl name='BufferCopy' type-id='type-id-79' mangled-name='_ZN3COI10BufferCopyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='145' column='1'/>
-      <var-decl name='BufferGetSinkAddress' type-id='type-id-91' mangled-name='_ZN3COI20BufferGetSinkAddressE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='148' column='1'/>
-      <var-decl name='BufferSetState' type-id='type-id-81' mangled-name='_ZN3COI14BufferSetStateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='149' column='1'/>
-      <var-decl name='EventWait' type-id='type-id-125' mangled-name='_ZN3COI9EventWaitE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='153' column='1'/>
-      <var-decl name='PerfGetCycleFrequency' type-id='type-id-135' mangled-name='_ZN3COI21PerfGetCycleFrequencyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='156' column='1'/>
-      <var-decl name='ProcessConfigureDMA' type-id='type-id-129' mangled-name='_ZN3COI19ProcessConfigureDMAE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='158' column='1'/>
-      <var-decl name='PipelineClearCPUMask' type-id='type-id-133' mangled-name='_ZN3COI20PipelineClearCPUMaskE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='160' column='1' elf-symbol-id='_ZN3COI20PipelineClearCPUMaskE'/>
-      <var-decl name='PipelineSetCPUMask' type-id='type-id-113' mangled-name='_ZN3COI18PipelineSetCPUMaskE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='162' column='1' elf-symbol-id='_ZN3COI18PipelineSetCPUMaskE'/>
-      <var-decl name='EngineGetInfo' type-id='type-id-97' mangled-name='_ZN3COI13EngineGetInfoE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='164' column='1' elf-symbol-id='_ZN3COI13EngineGetInfoE'/>
-      <var-decl name='EventRegisterCallback' type-id='type-id-99' mangled-name='_ZN3COI21EventRegisterCallbackE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='166' column='1' elf-symbol-id='_ZN3COI21EventRegisterCallbackE'/>
+      <var-decl name='EngineGetCount' type-id='type-id-121' mangled-name='_ZN3COI14EngineGetCountE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='63' column='1'/>
+      <var-decl name='EngineGetHandle' type-id='type-id-119' mangled-name='_ZN3COI15EngineGetHandleE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='64' column='1'/>
+      <var-decl name='ProcessCreateFromMemory' type-id='type-id-93' mangled-name='_ZN3COI23ProcessCreateFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='66' column='1'/>
+      <var-decl name='ProcessCreateFromFile' type-id='type-id-91' mangled-name='_ZN3COI21ProcessCreateFromFileE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='74' column='1'/>
+      <var-decl name='ProcessSetCacheSize' type-id='type-id-113' mangled-name='_ZN3COI19ProcessSetCacheSizeE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='82' column='1'/>
+      <var-decl name='ProcessDestroy' type-id='type-id-107' mangled-name='_ZN3COI14ProcessDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='85' column='1'/>
+      <var-decl name='ProcessGetFunctionHandles' type-id='type-id-109' mangled-name='_ZN3COI25ProcessGetFunctionHandlesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='87' column='1'/>
+      <var-decl name='ProcessLoadLibraryFromMemory' type-id='type-id-117' mangled-name='_ZN3COI28ProcessLoadLibraryFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='90' column='1'/>
+      <var-decl name='ProcessUnloadLibrary' type-id='type-id-105' mangled-name='_ZN3COI20ProcessUnloadLibraryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='100' column='1'/>
+      <var-decl name='ProcessRegisterLibraries' type-id='type-id-125' mangled-name='_ZN3COI24ProcessRegisterLibrariesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='103' column='1'/>
+      <var-decl name='PipelineCreate' type-id='type-id-115' mangled-name='_ZN3COI14PipelineCreateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='109' column='1'/>
+      <var-decl name='PipelineDestroy' type-id='type-id-101' mangled-name='_ZN3COI15PipelineDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='111' column='1'/>
+      <var-decl name='PipelineRunFunction' type-id='type-id-103' mangled-name='_ZN3COI19PipelineRunFunctionE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='112' column='1'/>
+      <var-decl name='BufferCreate' type-id='type-id-129' mangled-name='_ZN3COI12BufferCreateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='119' column='1'/>
+      <var-decl name='BufferCreateFromMemory' type-id='type-id-129' mangled-name='_ZN3COI22BufferCreateFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='122' column='1'/>
+      <var-decl name='BufferDestroy' type-id='type-id-75' mangled-name='_ZN3COI13BufferDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='126' column='1'/>
+      <var-decl name='BufferMap' type-id='type-id-83' mangled-name='_ZN3COI9BufferMapE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='127' column='1'/>
+      <var-decl name='BufferUnmap' type-id='type-id-99' mangled-name='_ZN3COI11BufferUnmapE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='130' column='1'/>
+      <var-decl name='BufferWrite' type-id='type-id-85' mangled-name='_ZN3COI11BufferWriteE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='132' column='1'/>
+      <var-decl name='BufferRead' type-id='type-id-85' mangled-name='_ZN3COI10BufferReadE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='135' column='1'/>
+      <var-decl name='BufferReadMultiD' type-id='type-id-87' mangled-name='_ZN3COI16BufferReadMultiDE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='138' column='1'/>
+      <var-decl name='BufferWriteMultiD' type-id='type-id-81' mangled-name='_ZN3COI17BufferWriteMultiDE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='141' column='1'/>
+      <var-decl name='BufferCopy' type-id='type-id-77' mangled-name='_ZN3COI10BufferCopyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='145' column='1'/>
+      <var-decl name='BufferGetSinkAddress' type-id='type-id-89' mangled-name='_ZN3COI20BufferGetSinkAddressE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='148' column='1'/>
+      <var-decl name='BufferSetState' type-id='type-id-79' mangled-name='_ZN3COI14BufferSetStateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='149' column='1'/>
+      <var-decl name='EventWait' type-id='type-id-123' mangled-name='_ZN3COI9EventWaitE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='153' column='1'/>
+      <var-decl name='PerfGetCycleFrequency' type-id='type-id-137' mangled-name='_ZN3COI21PerfGetCycleFrequencyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='156' column='1'/>
+      <var-decl name='ProcessConfigureDMA' type-id='type-id-127' mangled-name='_ZN3COI19ProcessConfigureDMAE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='158' column='1'/>
+      <var-decl name='PipelineClearCPUMask' type-id='type-id-131' mangled-name='_ZN3COI20PipelineClearCPUMaskE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='160' column='1' elf-symbol-id='_ZN3COI20PipelineClearCPUMaskE'/>
+      <var-decl name='PipelineSetCPUMask' type-id='type-id-111' mangled-name='_ZN3COI18PipelineSetCPUMaskE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='162' column='1' elf-symbol-id='_ZN3COI18PipelineSetCPUMaskE'/>
+      <var-decl name='EngineGetInfo' type-id='type-id-95' mangled-name='_ZN3COI13EngineGetInfoE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='164' column='1' elf-symbol-id='_ZN3COI13EngineGetInfoE'/>
+      <var-decl name='EventRegisterCallback' type-id='type-id-97' mangled-name='_ZN3COI21EventRegisterCallbackE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='166' column='1' elf-symbol-id='_ZN3COI21EventRegisterCallbackE'/>
     </namespace-decl>
-    <typedef-decl name='int8_t' type-id='type-id-145' filepath='/usr/include/stdint.h' line='36' column='1' id='type-id-74'/>
+    <typedef-decl name='int8_t' type-id='type-id-145' filepath='/usr/include/stdint.h' line='36' column='1' id='type-id-132'/>
     <typedef-decl name='int32_t' type-id='type-id-146' filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-147'/>
     <typedef-decl name='uint8_t' type-id='type-id-1' filepath='/usr/include/stdint.h' line='48' column='1' id='type-id-148'/>
     <typedef-decl name='uint16_t' type-id='type-id-149' filepath='/usr/include/stdint.h' line='49' column='1' id='type-id-29'/>
     <typedef-decl name='uint32_t' type-id='type-id-2' filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-27'/>
-    <function-type size-in-bits='64' id='type-id-76'>
+    <function-type size-in-bits='64' id='type-id-74'>
       <parameter type-id='type-id-31'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-78'>
+    <function-type size-in-bits='64' id='type-id-76'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-28'/>
@@ -1915,7 +1915,7 @@
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-80'>
+    <function-type size-in-bits='64' id='type-id-78'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-20'/>
@@ -1925,7 +1925,7 @@
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-82'>
+    <function-type size-in-bits='64' id='type-id-80'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-28'/>
@@ -1937,7 +1937,7 @@
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-84'>
+    <function-type size-in-bits='64' id='type-id-82'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-28'/>
@@ -1949,7 +1949,7 @@
       <parameter type-id='type-id-151'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-86'>
+    <function-type size-in-bits='64' id='type-id-84'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-150'/>
@@ -1960,7 +1960,7 @@
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-88'>
+    <function-type size-in-bits='64' id='type-id-86'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-150'/>
@@ -1971,12 +1971,12 @@
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-90'>
+    <function-type size-in-bits='64' id='type-id-88'>
       <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-137'/>
+      <parameter type-id='type-id-135'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-92'>
+    <function-type size-in-bits='64' id='type-id-90'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-146'/>
@@ -1990,7 +1990,7 @@
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-94'>
+    <function-type size-in-bits='64' id='type-id-92'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-150'/>
@@ -2008,31 +2008,31 @@
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-96'>
+    <function-type size-in-bits='64' id='type-id-94'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-48'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-98'>
+    <function-type size-in-bits='64' id='type-id-96'>
       <parameter type-id='type-id-35'/>
       <parameter type-id='type-id-139'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-28'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-100'>
+    <function-type size-in-bits='64' id='type-id-98'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-66'/>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-102'>
+    <function-type size-in-bits='64' id='type-id-100'>
       <parameter type-id='type-id-43'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-104'>
+    <function-type size-in-bits='64' id='type-id-102'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-37'/>
       <parameter type-id='type-id-27'/>
@@ -2047,34 +2047,34 @@
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-106'>
+    <function-type size-in-bits='64' id='type-id-104'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-39'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-108'>
+    <function-type size-in-bits='64' id='type-id-106'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-148'/>
-      <parameter type-id='type-id-75'/>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-133'/>
+      <parameter type-id='type-id-134'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-110'>
+    <function-type size-in-bits='64' id='type-id-108'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-112'>
+    <function-type size-in-bits='64' id='type-id-110'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-148'/>
-      <parameter type-id='type-id-137'/>
+      <parameter type-id='type-id-135'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-114'>
+    <function-type size-in-bits='64' id='type-id-112'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-27'/>
@@ -2085,14 +2085,14 @@
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-116'>
+    <function-type size-in-bits='64' id='type-id-114'>
       <parameter type-id='type-id-45'/>
-      <parameter type-id='type-id-137'/>
+      <parameter type-id='type-id-135'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-118'>
+    <function-type size-in-bits='64' id='type-id-116'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-28'/>
@@ -2104,27 +2104,27 @@
       <parameter type-id='type-id-40'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-120'>
+    <function-type size-in-bits='64' id='type-id-118'>
       <parameter type-id='type-id-13'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-34'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-122'>
+    <function-type size-in-bits='64' id='type-id-120'>
       <parameter type-id='type-id-13'/>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-134'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-124'>
+    <function-type size-in-bits='64' id='type-id-122'>
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-66'/>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-148'/>
-      <parameter type-id='type-id-136'/>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-134'/>
+      <parameter type-id='type-id-134'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-126'>
+    <function-type size-in-bits='64' id='type-id-124'>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-151'/>
       <parameter type-id='type-id-73'/>
@@ -2132,12 +2132,12 @@
       <parameter type-id='type-id-73'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-128'>
+    <function-type size-in-bits='64' id='type-id-126'>
       <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-146'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-130'>
+    <function-type size-in-bits='64' id='type-id-128'>
       <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-141'/>
       <parameter type-id='type-id-27'/>
@@ -2147,11 +2147,11 @@
       <parameter type-id='type-id-32'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-132'>
-      <parameter type-id='type-id-137'/>
+    <function-type size-in-bits='64' id='type-id-130'>
+      <parameter type-id='type-id-135'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-134'>
+    <function-type size-in-bits='64' id='type-id-136'>
       <return type-id='type-id-28'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-138'>
@@ -19224,9 +19224,9 @@
       <parameter type-id='type-id-146' name='target' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5723' column='1'/>
       <parameter type-id='type-id-150' name='cpu_addr' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5724' column='1'/>
       <parameter type-id='type-id-151' name='cpu_base_addr' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5725' column='1'/>
-      <parameter type-id='type-id-137' name='buf_length' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5726' column='1'/>
+      <parameter type-id='type-id-135' name='buf_length' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5726' column='1'/>
       <parameter type-id='type-id-151' name='mic_addr' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5727' column='1'/>
-      <parameter type-id='type-id-137' name='mic_buf_start_offset' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5728' column='1'/>
+      <parameter type-id='type-id-135' name='mic_buf_start_offset' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5728' column='1'/>
       <parameter type-id='type-id-2185' name='is_static' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5729' column='1'/>
       <return type-id='type-id-146'/>
     </function-decl>
@@ -19680,42 +19680,42 @@
     <reference-type-def kind='lvalue' type-id='type-id-2960' size-in-bits='64' id='type-id-2961'/>
     <qualified-type-def type-id='type-id-2962' const='yes' id='type-id-2963'/>
     <reference-type-def kind='lvalue' type-id='type-id-2963' size-in-bits='64' id='type-id-2964'/>
-    <pointer-type-def type-id='type-id-2924' size-in-bits='64' id='type-id-2965'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2927' size-in-bits='64' id='type-id-2966'/>
-    <pointer-type-def type-id='type-id-2933' size-in-bits='64' id='type-id-2967'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2936' size-in-bits='64' id='type-id-2968'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2939' size-in-bits='64' id='type-id-2969'/>
-    <pointer-type-def type-id='type-id-2939' size-in-bits='64' id='type-id-2970'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2971' size-in-bits='64' id='type-id-2972'/>
-    <pointer-type-def type-id='type-id-2971' size-in-bits='64' id='type-id-2973'/>
-    <pointer-type-def type-id='type-id-2974' size-in-bits='64' id='type-id-2975'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2943' size-in-bits='64' id='type-id-2976'/>
-    <pointer-type-def type-id='type-id-2943' size-in-bits='64' id='type-id-2977'/>
-    <pointer-type-def type-id='type-id-2978' size-in-bits='64' id='type-id-2979'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2946' size-in-bits='64' id='type-id-2980'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2949' size-in-bits='64' id='type-id-2981'/>
-    <pointer-type-def type-id='type-id-2949' size-in-bits='64' id='type-id-2982'/>
+    <pointer-type-def type-id='type-id-2965' size-in-bits='64' id='type-id-2875'/>
+    <pointer-type-def type-id='type-id-2966' size-in-bits='64' id='type-id-2885'/>
+    <pointer-type-def type-id='type-id-2967' size-in-bits='64' id='type-id-2884'/>
+    <pointer-type-def type-id='type-id-2968' size-in-bits='64' id='type-id-2881'/>
+    <pointer-type-def type-id='type-id-2969' size-in-bits='64' id='type-id-2880'/>
+    <pointer-type-def type-id='type-id-2970' size-in-bits='64' id='type-id-2876'/>
+    <pointer-type-def type-id='type-id-2971' size-in-bits='64' id='type-id-2877'/>
+    <pointer-type-def type-id='type-id-2972' size-in-bits='64' id='type-id-2871'/>
+    <pointer-type-def type-id='type-id-2973' size-in-bits='64' id='type-id-2878'/>
+    <pointer-type-def type-id='type-id-2924' size-in-bits='64' id='type-id-2974'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2927' size-in-bits='64' id='type-id-2975'/>
+    <pointer-type-def type-id='type-id-2933' size-in-bits='64' id='type-id-2976'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2936' size-in-bits='64' id='type-id-2977'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2939' size-in-bits='64' id='type-id-2978'/>
+    <pointer-type-def type-id='type-id-2939' size-in-bits='64' id='type-id-2979'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2980' size-in-bits='64' id='type-id-2981'/>
+    <pointer-type-def type-id='type-id-2980' size-in-bits='64' id='type-id-2982'/>
     <pointer-type-def type-id='type-id-2983' size-in-bits='64' id='type-id-2984'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2985' size-in-bits='64' id='type-id-2986'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2956' size-in-bits='64' id='type-id-2987'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2959' size-in-bits='64' id='type-id-2988'/>
-    <pointer-type-def type-id='type-id-2959' size-in-bits='64' id='type-id-2989'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2962' size-in-bits='64' id='type-id-2990'/>
-    <pointer-type-def type-id='type-id-2962' size-in-bits='64' id='type-id-2991'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2992' size-in-bits='64' id='type-id-2993'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2943' size-in-bits='64' id='type-id-2985'/>
+    <pointer-type-def type-id='type-id-2943' size-in-bits='64' id='type-id-2986'/>
+    <pointer-type-def type-id='type-id-2987' size-in-bits='64' id='type-id-2988'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2946' size-in-bits='64' id='type-id-2989'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2949' size-in-bits='64' id='type-id-2990'/>
+    <pointer-type-def type-id='type-id-2949' size-in-bits='64' id='type-id-2991'/>
+    <pointer-type-def type-id='type-id-2992' size-in-bits='64' id='type-id-2993'/>
     <reference-type-def kind='lvalue' type-id='type-id-2994' size-in-bits='64' id='type-id-2995'/>
-    <pointer-type-def type-id='type-id-2996' size-in-bits='64' id='type-id-2875'/>
-    <pointer-type-def type-id='type-id-2997' size-in-bits='64' id='type-id-2885'/>
-    <pointer-type-def type-id='type-id-2998' size-in-bits='64' id='type-id-2884'/>
-    <pointer-type-def type-id='type-id-2999' size-in-bits='64' id='type-id-2881'/>
-    <pointer-type-def type-id='type-id-3000' size-in-bits='64' id='type-id-2880'/>
-    <pointer-type-def type-id='type-id-3001' size-in-bits='64' id='type-id-2876'/>
-    <pointer-type-def type-id='type-id-3002' size-in-bits='64' id='type-id-2877'/>
-    <pointer-type-def type-id='type-id-3003' size-in-bits='64' id='type-id-2871'/>
-    <pointer-type-def type-id='type-id-3004' size-in-bits='64' id='type-id-2878'/>
-    <pointer-type-def type-id='type-id-3005' size-in-bits='64' id='type-id-2879'/>
-    <pointer-type-def type-id='type-id-3006' size-in-bits='64' id='type-id-2873'/>
-    <pointer-type-def type-id='type-id-3007' size-in-bits='64' id='type-id-3008'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2956' size-in-bits='64' id='type-id-2996'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2959' size-in-bits='64' id='type-id-2997'/>
+    <pointer-type-def type-id='type-id-2959' size-in-bits='64' id='type-id-2998'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2962' size-in-bits='64' id='type-id-2999'/>
+    <pointer-type-def type-id='type-id-2962' size-in-bits='64' id='type-id-3000'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3001' size-in-bits='64' id='type-id-3002'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3003' size-in-bits='64' id='type-id-3004'/>
+    <pointer-type-def type-id='type-id-3005' size-in-bits='64' id='type-id-2873'/>
+    <pointer-type-def type-id='type-id-3006' size-in-bits='64' id='type-id-3007'/>
+    <pointer-type-def type-id='type-id-3008' size-in-bits='64' id='type-id-2879'/>
     <pointer-type-def type-id='type-id-3009' size-in-bits='64' id='type-id-2882'/>
     <pointer-type-def type-id='type-id-3010' size-in-bits='64' id='type-id-2883'/>
     <pointer-type-def type-id='type-id-3011' size-in-bits='64' id='type-id-2872'/>
@@ -19755,7 +19755,7 @@
         </member-type>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;MyoTable, MyoTable&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE12_S_constructIS1_JS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PS9_DpOSA_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE12_S_constructIS1_JS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PS9_DpOSA_'>
-            <parameter type-id='type-id-2990'/>
+            <parameter type-id='type-id-2999'/>
             <parameter type-id='type-id-2892'/>
             <parameter type-id='type-id-2900'/>
             <return type-id='type-id-154'/>
@@ -19763,14 +19763,14 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE8allocateERS3_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE8allocateERS3_m'>
-            <parameter type-id='type-id-2990'/>
+            <parameter type-id='type-id-2999'/>
             <parameter type-id='type-id-3028'/>
             <return type-id='type-id-3025'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;MyoTable, MyoTable&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE9constructIS1_JS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS6_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE9constructIS1_JS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS6_'>
-            <parameter type-id='type-id-2990'/>
+            <parameter type-id='type-id-2999'/>
             <parameter type-id='type-id-2892'/>
             <parameter type-id='type-id-2900'/>
             <return type-id='type-id-154'/>
@@ -19778,7 +19778,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE10deallocateERS3_PS2_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE10deallocateERS3_PS2_m'>
-            <parameter type-id='type-id-2990'/>
+            <parameter type-id='type-id-2999'/>
             <parameter type-id='type-id-3025'/>
             <parameter type-id='type-id-3028'/>
             <return type-id='type-id-154'/>
@@ -19786,7 +19786,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;, MyoTable&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i'>
-            <parameter type-id='type-id-2990'/>
+            <parameter type-id='type-id-2999'/>
             <parameter type-id='type-id-2892'/>
             <parameter type-id='type-id-146'/>
             <return type-id='type-id-154'/>
@@ -19794,57 +19794,57 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;MyoTable&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE7destroyIS1_EEvRS3_PT_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE7destroyIS1_EEvRS3_PT_'>
-            <parameter type-id='type-id-2990'/>
+            <parameter type-id='type-id-2999'/>
             <parameter type-id='type-id-2892'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2971'>
+      <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2980'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-3025' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-3029'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3023' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2974'/>
+          <typedef-decl name='value_type' type-id='type-id-3023' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2983'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_alloc' type-id='type-id-2991' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='94' column='1'/>
+          <var-decl name='_M_alloc' type-id='type-id-3000' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='94' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_ptr' type-id='type-id-3029' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='95' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEaSEDn' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEaSEDn'>
-            <parameter type-id='type-id-2973' is-artificial='yes'/>
-            <return type-id='type-id-2972'/>
+            <parameter type-id='type-id-2982' is-artificial='yes'/>
+            <return type-id='type-id-2981'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEED4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2973' is-artificial='yes'/>
+            <parameter type-id='type-id-2982' is-artificial='yes'/>
             <parameter type-id='type-id-146' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEED2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEED2Ev'>
-            <parameter type-id='type-id-2973' is-artificial='yes'/>
+            <parameter type-id='type-id-2982' is-artificial='yes'/>
             <parameter type-id='type-id-146' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEC4ERS3_PS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2973' is-artificial='yes'/>
-            <parameter type-id='type-id-2990'/>
+            <parameter type-id='type-id-2982' is-artificial='yes'/>
+            <parameter type-id='type-id-2999'/>
             <parameter type-id='type-id-3029'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEC2ERS3_PS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEC2ERS3_PS2_'>
-            <parameter type-id='type-id-2973' is-artificial='yes'/>
-            <parameter type-id='type-id-2990'/>
+            <parameter type-id='type-id-2982' is-artificial='yes'/>
+            <parameter type-id='type-id-2999'/>
             <parameter type-id='type-id-3029'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -19875,33 +19875,33 @@
           <typedef-decl name='size_type' type-id='type-id-1088' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-3034'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2970' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-3035'/>
+          <typedef-decl name='pointer' type-id='type-id-2979' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-3035'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='value_type' type-id='type-id-2939' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-3024'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='allocator' mangled-name='_ZNSaISt10_List_nodeI8MyoTableEEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-3000' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' mangled-name='_ZNSaISt10_List_nodeI8MyoTableEEC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt10_List_nodeI8MyoTableEEC2Ev'>
-            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-3000' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaISt10_List_nodeI8MyoTableEED4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-3000' is-artificial='yes'/>
             <parameter type-id='type-id-146' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaISt10_List_nodeI8MyoTableEED2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt10_List_nodeI8MyoTableEED2Ev'>
-            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-3000' is-artificial='yes'/>
             <parameter type-id='type-id-146' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -19914,7 +19914,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_M_valptr' mangled-name='_ZNSt10_List_nodeI8MyoTableE9_M_valptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_nodeI8MyoTableE9_M_valptrEv'>
-            <parameter type-id='type-id-2970' is-artificial='yes'/>
+            <parameter type-id='type-id-2979' is-artificial='yes'/>
             <return type-id='type-id-2892'/>
           </function-decl>
         </member-function>
@@ -19940,14 +19940,14 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_iterator' mangled-name='_ZNSt14_List_iteratorI8MyoTableEC4EPNSt8__detail15_List_node_baseE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2967' is-artificial='yes'/>
+            <parameter type-id='type-id-2976' is-artificial='yes'/>
             <parameter type-id='type-id-1016'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_iterator' mangled-name='_ZNSt14_List_iteratorI8MyoTableEC2EPNSt8__detail15_List_node_baseE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_List_iteratorI8MyoTableEC2EPNSt8__detail15_List_node_baseE'>
-            <parameter type-id='type-id-2967' is-artificial='yes'/>
+            <parameter type-id='type-id-2976' is-artificial='yes'/>
             <parameter type-id='type-id-1016'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -19980,8 +19980,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt20_List_const_iteratorI8MyoTableEppEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorI8MyoTableEppEv'>
-            <parameter type-id='type-id-2965' is-artificial='yes'/>
-            <return type-id='type-id-2966'/>
+            <parameter type-id='type-id-2974' is-artificial='yes'/>
+            <return type-id='type-id-2975'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
@@ -19993,14 +19993,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' mangled-name='_ZNSt20_List_const_iteratorI8MyoTableEC4ERKSt14_List_iteratorIS0_E' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2965' is-artificial='yes'/>
+            <parameter type-id='type-id-2974' is-artificial='yes'/>
             <parameter type-id='type-id-2932'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' mangled-name='_ZNSt20_List_const_iteratorI8MyoTableEC2ERKSt14_List_iteratorIS0_E' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorI8MyoTableEC2ERKSt14_List_iteratorIS0_E'>
-            <parameter type-id='type-id-2965' is-artificial='yes'/>
+            <parameter type-id='type-id-2974' is-artificial='yes'/>
             <parameter type-id='type-id-2932'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -20008,12 +20008,12 @@
       </class-decl>
       <class-decl name='remove_reference&lt;MyoTable&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-3041'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2890' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2994'/>
+          <typedef-decl name='type' type-id='type-id-2890' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-3003'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;MyoTable&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-3042'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2890' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2992'/>
+          <typedef-decl name='type' type-id='type-id-2890' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-3001'/>
         </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-3043'>
@@ -20056,16 +20056,16 @@
       <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;MyoTable&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3062'/>
       <typedef-decl name='__alloc_rebind' type-id='type-id-3063' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='74' column='1' id='type-id-3021'/>
       <function-decl name='__addressof&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' mangled-name='_ZSt11__addressofISaISt10_List_nodeI8MyoTableEEEPT_RS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofISaISt10_List_nodeI8MyoTableEEEPT_RS4_'>
-        <parameter type-id='type-id-2990' name='__r' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-2991'/>
+        <parameter type-id='type-id-2999' name='__r' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-3000'/>
       </function-decl>
       <function-decl name='forward&lt;MyoTable&gt;' mangled-name='_ZSt7forwardI8MyoTableEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardI8MyoTableEOT_RNSt16remove_referenceIS1_E4typeE'>
-        <parameter type-id='type-id-2995' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
+        <parameter type-id='type-id-3004' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
         <return type-id='type-id-2900'/>
       </function-decl>
       <function-decl name='move&lt;MyoTable&amp;&gt;' mangled-name='_ZSt4moveIR8MyoTableEONSt16remove_referenceIT_E4typeEOS3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIR8MyoTableEONSt16remove_referenceIT_E4typeEOS3_'>
         <parameter type-id='type-id-2900' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2993'/>
+        <return type-id='type-id-3002'/>
       </function-decl>
       <typedef-decl name='__detected_or_t' type-id='type-id-3048' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-3017'/>
       <typedef-decl name='__detected_or_t' type-id='type-id-3058' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-3064'/>
@@ -20074,20 +20074,20 @@
       <namespace-decl name='__cxx11'>
         <class-decl name='_List_base&lt;MyoTable, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-2943'>
           <member-type access='protected'>
-            <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-2978'>
+            <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-2987'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2962'/>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='_M_node' type-id='type-id-507' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='327' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='_List_impl' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-2979' is-artificial='yes'/>
+                  <parameter type-id='type-id-2988' is-artificial='yes'/>
                   <return type-id='type-id-154'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='_List_impl' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implC2Ev'>
-                  <parameter type-id='type-id-2979' is-artificial='yes'/>
+                  <parameter type-id='type-id-2988' is-artificial='yes'/>
                   <return type-id='type-id-154'/>
                 </function-decl>
               </member-function>
@@ -20097,76 +20097,76 @@
             <typedef-decl name='_Node_alloc_type' type-id='type-id-3065' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-2946'/>
           </member-type>
           <data-member access='protected' layout-offset-in-bits='0'>
-            <var-decl name='_M_impl' type-id='type-id-2978' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='347' column='1'/>
+            <var-decl name='_M_impl' type-id='type-id-2987' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='347' column='1'/>
           </data-member>
           <member-function access='protected'>
             <function-decl name='_M_get_node' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_get_nodeEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_get_nodeEv'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <return type-id='type-id-3066'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_inc_sizeEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_inc_sizeEm'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <parameter type-id='type-id-1088'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_set_sizeEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_set_sizeEm'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <parameter type-id='type-id-1088'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_put_node' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_put_nodeEPSt10_List_nodeIS1_E' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_put_nodeEPSt10_List_nodeIS1_E'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <parameter type-id='type-id-3066'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE21_M_get_Node_allocatorEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE21_M_get_Node_allocatorEv'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
-              <return type-id='type-id-2980'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
+              <return type-id='type-id-2989'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_init' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE7_M_initEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='448' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE7_M_initEv'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_clear' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE8_M_clearEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/list.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE8_M_clearEv'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private' destructor='yes'>
             <function-decl name='~_List_base' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EED4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <parameter type-id='type-id-146' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private' destructor='yes'>
             <function-decl name='~_List_base' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EED2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EED2Ev'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <parameter type-id='type-id-146' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_List_base' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='400' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_List_base' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EEC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EEC2Ev'>
-              <parameter type-id='type-id-2977' is-artificial='yes'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -20195,24 +20195,24 @@
             <typedef-decl name='reverse_iterator' type-id='type-id-3062' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-3074'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='size_type' type-id='type-id-1088' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-2985'/>
+            <typedef-decl name='size_type' type-id='type-id-1088' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-2994'/>
           </member-type>
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-2959' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-2953'/>
           </member-type>
           <member-type access='protected'>
-            <typedef-decl name='_Node' type-id='type-id-2939' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-2983'/>
+            <typedef-decl name='_Node' type-id='type-id-2939' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-2992'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='_M_create_node&lt;MyoTable&gt;' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE14_M_create_nodeIJS1_EEEPSt10_List_nodeIS1_EDpOT_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE14_M_create_nodeIJS1_EEEPSt10_List_nodeIS1_EDpOT_'>
-              <parameter type-id='type-id-2982' is-artificial='yes'/>
+              <parameter type-id='type-id-2991' is-artificial='yes'/>
               <parameter type-id='type-id-2900'/>
-              <return type-id='type-id-2984'/>
+              <return type-id='type-id-2993'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_insert&lt;MyoTable&gt;' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE9_M_insertIJS1_EEEvSt14_List_iteratorIS1_EDpOT_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE9_M_insertIJS1_EEEvSt14_List_iteratorIS1_EDpOT_'>
-              <parameter type-id='type-id-2982' is-artificial='yes'/>
+              <parameter type-id='type-id-2991' is-artificial='yes'/>
               <parameter type-id='type-id-3071'/>
               <parameter type-id='type-id-2900'/>
               <return type-id='type-id-154'/>
@@ -20220,38 +20220,38 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='push_back' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE9push_backEOS1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='1102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE9push_backEOS1_'>
-              <parameter type-id='type-id-2982' is-artificial='yes'/>
-              <parameter type-id='type-id-2987'/>
+              <parameter type-id='type-id-2991' is-artificial='yes'/>
+              <parameter type-id='type-id-2996'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='clear' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE5clearEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='1376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE5clearEv'>
-              <parameter type-id='type-id-2982' is-artificial='yes'/>
+              <parameter type-id='type-id-2991' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='end' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE3endEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='858' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE3endEv'>
-              <parameter type-id='type-id-2982' is-artificial='yes'/>
+              <parameter type-id='type-id-2991' is-artificial='yes'/>
               <return type-id='type-id-3071'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='begin' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE5beginEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE5beginEv'>
-              <parameter type-id='type-id-2982' is-artificial='yes'/>
+              <parameter type-id='type-id-2991' is-artificial='yes'/>
               <return type-id='type-id-3071'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='list' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2982' is-artificial='yes'/>
+              <parameter type-id='type-id-2991' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='list' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EEC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EEC2Ev'>
-              <parameter type-id='type-id-2982' is-artificial='yes'/>
+              <parameter type-id='type-id-2991' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -20329,7 +20329,7 @@
     </function-decl>
     <function-decl name='__intel_cilk_for_32_offload' mangled-name='__intel_cilk_for_32_offload' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__intel_cilk_for_32_offload'>
       <parameter type-id='type-id-146' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1209' column='1'/>
-      <parameter type-id='type-id-3008' name='copy_constructor' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1210' column='1'/>
+      <parameter type-id='type-id-3007' name='copy_constructor' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1210' column='1'/>
       <parameter type-id='type-id-146' name='target_number' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1211' column='1'/>
       <parameter type-id='type-id-150' name='raddr' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1212' column='1'/>
       <parameter type-id='type-id-150' name='closure_object' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1213' column='1'/>
@@ -20339,7 +20339,7 @@
     </function-decl>
     <function-decl name='__intel_cilk_for_64_offload' mangled-name='__intel_cilk_for_64_offload' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__intel_cilk_for_64_offload'>
       <parameter type-id='type-id-146' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1262' column='1'/>
-      <parameter type-id='type-id-3008' name='copy_constructor' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1263' column='1'/>
+      <parameter type-id='type-id-3007' name='copy_constructor' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1263' column='1'/>
       <parameter type-id='type-id-146' name='target_number' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1264' column='1'/>
       <parameter type-id='type-id-150' name='raddr' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1265' column='1'/>
       <parameter type-id='type-id-150' name='closure_object' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1266' column='1'/>
@@ -20424,13 +20424,13 @@
           <typedef-decl name='size_type' type-id='type-id-1088' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-3086'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2970' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-3087'/>
+          <typedef-decl name='pointer' type-id='type-id-2979' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-3087'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_pointer' type-id='type-id-2942' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-3088'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-2969' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3089'/>
+          <typedef-decl name='reference' type-id='type-id-2978' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3089'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_reference' type-id='type-id-2941' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-3090'/>
@@ -20500,60 +20500,60 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-2996'>
+    <function-type size-in-bits='64' id='type-id-2965'>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2997'>
+    <function-type size-in-bits='64' id='type-id-2966'>
       <parameter type-id='type-id-146'/>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2998'>
+    <function-type size-in-bits='64' id='type-id-2967'>
       <parameter type-id='type-id-2870'/>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2999'>
+    <function-type size-in-bits='64' id='type-id-2968'>
       <parameter type-id='type-id-2867'/>
       <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-2888'/>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3000'>
+    <function-type size-in-bits='64' id='type-id-2969'>
       <parameter type-id='type-id-2889'/>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3001'>
+    <function-type size-in-bits='64' id='type-id-2970'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-146'/>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3002'>
+    <function-type size-in-bits='64' id='type-id-2971'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-146'/>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3003'>
+    <function-type size-in-bits='64' id='type-id-2972'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-150'/>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3004'>
+    <function-type size-in-bits='64' id='type-id-2973'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-146'/>
       <return type-id='type-id-2865'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3005'>
+    <function-type size-in-bits='64' id='type-id-3006'>
+      <parameter type-id='type-id-150'/>
+      <parameter type-id='type-id-150'/>
+      <return type-id='type-id-154'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-3008'>
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-146'/>
       <return type-id='type-id-2889'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3007'>
-      <parameter type-id='type-id-150'/>
-      <parameter type-id='type-id-150'/>
-      <return type-id='type-id-154'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-3009'>
       <parameter type-id='type-id-2870' name='arena'/>
       <parameter type-id='type-id-195' name='size'/>
@@ -20573,7 +20573,7 @@
       <parameter type-id='type-id-2870' name='arena'/>
       <return type-id='type-id-154'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3006'>
+    <function-type size-in-bits='64' id='type-id-3005'>
       <parameter type-id='type-id-150' name='ptr'/>
       <return type-id='type-id-154'/>
     </function-type>

diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index 3d5b63e9746e10d757d94e06624a1947f80fca0c..43a31a68c80abdbe96a83cfa25e45202d39b3eb4 100644 (file)
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -1635,8 +1635,7 @@
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-159'/>
-    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-160'>
+    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='92' column='1'/>
       </data-member>
@@ -1644,10 +1643,10 @@
         <var-decl name='immutable' type-id='type-id-35' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='parent' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
+        <var-decl name='parent' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
+        <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='x_scale' type-id='type-id-9' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='100' column='1'/>
@@ -1662,7 +1661,7 @@
         <var-decl name='y_ppem' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='klass' type-id='type-id-163' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
+        <var-decl name='klass' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='user_data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='107' column='1'/>
@@ -1671,18 +1670,18 @@
         <var-decl name='destroy' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='shaper_data' type-id='type-id-164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='get_glyph_h_advance' mangled-name='_ZN9hb_font_t19get_glyph_h_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph' mangled-name='_ZN9hb_font_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-127'/>
@@ -1691,7 +1690,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_name' mangled-name='_ZN9hb_font_t14get_glyph_nameEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-45'/>
           <parameter type-id='type-id-12'/>
@@ -1700,32 +1699,32 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_advance' mangled-name='_ZN9hb_font_t19get_glyph_v_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_h_origin' mangled-name='_ZN9hb_font_t18get_glyph_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_origin' mangled-name='_ZN9hb_font_t18get_glyph_v_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_h_kerning' mangled-name='_ZN9hb_font_t19get_glyph_h_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-103'/>
@@ -1733,7 +1732,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_kerning' mangled-name='_ZN9hb_font_t19get_glyph_v_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-103'/>
@@ -1741,109 +1740,109 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_contour_point' mangled-name='_ZN9hb_font_t23get_glyph_contour_pointEjjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_x_position' mangled-name='_ZN9hb_font_t23parent_scale_x_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-103'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_y_position' mangled-name='_ZN9hb_font_t23parent_scale_y_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-103'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='guess_v_origin_minus_h_origin' mangled-name='_ZN9hb_font_t29guess_v_origin_minus_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='subtract_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t35subtract_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_contour_point_for_origin' mangled-name='_ZN9hb_font_t34get_glyph_contour_point_for_originEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30add_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_kerning_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_kerning_for_directionEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_advance_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_advance_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_distance' mangled-name='_ZN9hb_font_t21parent_scale_distanceEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_extents_for_origin' mangled-name='_ZN9hb_font_t28get_glyph_extents_for_originEj14hb_direction_tP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-166'/>
+          <parameter type-id='type-id-164'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='glyph_from_string' mangled-name='_ZN9hb_font_t17glyph_from_stringEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='375' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-9'/>
           <parameter type-id='type-id-127'/>
@@ -1852,7 +1851,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='glyph_to_string' mangled-name='_ZN9hb_font_t15glyph_to_stringEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-45'/>
           <parameter type-id='type-id-12'/>
@@ -1861,17 +1860,17 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30get_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_from_name' mangled-name='_ZN9hb_font_t19get_glyph_from_nameEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-9'/>
           <parameter type-id='type-id-127'/>
@@ -1880,37 +1879,37 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_position' mangled-name='_ZN9hb_font_t21parent_scale_positionEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_x_distance' mangled-name='_ZN9hb_font_t23parent_scale_x_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-103'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_y_distance' mangled-name='_ZN9hb_font_t23parent_scale_y_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-103'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_extents' mangled-name='_ZN9hb_font_t17get_glyph_extentsEjP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <parameter type-id='type-id-166'/>
+          <parameter type-id='type-id-164'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='em_scale' mangled-name='_ZN9hb_font_t8em_scaleEsi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-67'/>
           <parameter type-id='type-id-9'/>
           <return type-id='type-id-103'/>
@@ -1918,21 +1917,21 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='em_scale_y' mangled-name='_ZN9hb_font_t10em_scale_yEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-67'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='em_scale_x' mangled-name='_ZN9hb_font_t10em_scale_xEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-67'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='has_glyph' mangled-name='_ZN9hb_font_t9has_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-35'/>
         </function-decl>
@@ -1940,7 +1939,7 @@
     </class-decl>
     <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-133'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='s' type-id='type-id-167' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
+        <var-decl name='s' type-id='type-id-165' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
       </data-member>
     </class-decl>
     <function-decl name='hb_buffer_serialize_list_formats' mangled-name='hb_buffer_serialize_list_formats' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_list_formats'>
@@ -1985,16 +1984,16 @@
     <typedef-decl name='hb_mask_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='77' column='1' id='type-id-92'/>
     <typedef-decl name='hb_var_int_t' type-id='type-id-110' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-101'/>
     <typedef-decl name='hb_language_t' type-id='type-id-135' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='137' column='1' id='type-id-107'/>
-    <typedef-decl name='hb_font_t' type-id='type-id-160' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='40' column='1' id='type-id-146'/>
+    <typedef-decl name='hb_font_t' type-id='type-id-158' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='40' column='1' id='type-id-146'/>
     <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-112' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-149'/>
     <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-141' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-114'/>
-    <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-159' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-115'/>
+    <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-157' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-115'/>
     <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-143' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-116'/>
-    <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-155' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-117'/>
+    <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-157' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-117'/>
     <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-139' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-118'/>
     <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-153' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-119'/>
     <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-151' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-120'/>
-    <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-157' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-121'/>
+    <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-155' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-121'/>
     <typedef-decl name='int8_t' type-id='type-id-73' filepath='/usr/include/stdint.h' line='37' column='1' id='type-id-69'/>
     <typedef-decl name='int16_t' type-id='type-id-72' filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-67'/>
     <typedef-decl name='int32_t' type-id='type-id-9' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-111'/>
@@ -2036,19 +2035,13 @@
       <return type-id='type-id-35'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-154'>
-      <parameter type-id='type-id-84'/>
-      <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-17'/>
-      <return type-id='type-id-64'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-156'>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-12'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-158'>
+    <function-type size-in-bits='64' id='type-id-156'>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-17'/>
@@ -2058,103 +2051,103 @@
   <abi-instr address-size='64' path='hb-buffer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-133'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='s' type-id='type-id-167' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
+        <var-decl name='s' type-id='type-id-165' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_utf_t&lt;unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='32' column='1' id='type-id-168'>
+    <class-decl name='hb_utf_t&lt;unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='32' column='1' id='type-id-166'>
       <member-function access='public' static='yes'>
         <function-decl name='next' mangled-name='_ZN8hb_utf_tIjLb1EE4nextEPKjS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-169'/>
-          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-167'/>
+          <parameter type-id='type-id-167'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-169'/>
+          <return type-id='type-id-167'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <function-decl name='strlen' mangled-name='_ZN8hb_utf_tIjLb1EE6strlenEPKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-167'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tIjLb1EE4prevEPKjS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-169'/>
-          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-167'/>
+          <parameter type-id='type-id-167'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-169'/>
+          <return type-id='type-id-167'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_utf_t&lt;unsigned char, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='39' column='1' id='type-id-170'>
+    <class-decl name='hb_utf_t&lt;unsigned char, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='39' column='1' id='type-id-168'>
       <member-function access='public' static='yes'>
         <function-decl name='strlen' mangled-name='_ZN8hb_utf_tIhLb1EE6strlenEPKh' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-169'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tIhLb1EE4prevEPKhS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-171'/>
-          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-169'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-64'/>
-          <return type-id='type-id-171'/>
+          <return type-id='type-id-169'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <function-decl name='next' mangled-name='_ZN8hb_utf_tIhLb1EE4nextEPKhS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-171'/>
-          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-169'/>
+          <parameter type-id='type-id-169'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-64'/>
-          <return type-id='type-id-171'/>
+          <return type-id='type-id-169'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_utf_t&lt;short unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='138' column='1' id='type-id-172'>
+    <class-decl name='hb_utf_t&lt;short unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='138' column='1' id='type-id-170'>
       <member-function access='public' static='yes'>
         <function-decl name='strlen' mangled-name='_ZN8hb_utf_tItLb1EE6strlenEPKt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-171'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tItLb1EE4prevEPKtS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-173'/>
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-171'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-64'/>
-          <return type-id='type-id-173'/>
+          <return type-id='type-id-171'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <function-decl name='next' mangled-name='_ZN8hb_utf_tItLb1EE4nextEPKtS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-173'/>
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-171'/>
+          <parameter type-id='type-id-171'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-64'/>
-          <return type-id='type-id-173'/>
+          <return type-id='type-id-171'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-174'/>
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
-    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-176'/>
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-173'/>
-    <qualified-type-def type-id='type-id-100' const='yes' id='type-id-177'/>
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-169'/>
-    <qualified-type-def type-id='type-id-76' const='yes' id='type-id-178'/>
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-171'/>
-    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-179'/>
+    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-172'/>
+    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
+    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-174'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-171'/>
+    <qualified-type-def type-id='type-id-100' const='yes' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-167'/>
+    <qualified-type-def type-id='type-id-76' const='yes' id='type-id-176'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-177'/>
     <function-decl name='hb_segment_properties_equal' mangled-name='hb_segment_properties_equal' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_segment_properties_equal'>
-      <parameter type-id='type-id-175' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='40' column='1'/>
-      <parameter type-id='type-id-175' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='41' column='1'/>
+      <parameter type-id='type-id-173' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='40' column='1'/>
+      <parameter type-id='type-id-173' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='41' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_segment_properties_hash' mangled-name='hb_segment_properties_hash' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_segment_properties_hash'>
-      <parameter type-id='type-id-175' name='p' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='52' column='1'/>
+      <parameter type-id='type-id-173' name='p' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='52' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_buffer_create' mangled-name='hb_buffer_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_create'>
@@ -2231,12 +2224,12 @@
     </function-decl>
     <function-decl name='hb_buffer_set_segment_properties' mangled-name='hb_buffer_set_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_segment_properties'>
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
-      <parameter type-id='type-id-175' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
+      <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_buffer_get_segment_properties' mangled-name='hb_buffer_get_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_segment_properties'>
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
-      <parameter type-id='type-id-179' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
+      <parameter type-id='type-id-177' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_buffer_set_flags' mangled-name='hb_buffer_set_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_flags'>
@@ -2321,7 +2314,7 @@
     </function-decl>
     <function-decl name='hb_buffer_add_utf16' mangled-name='hb_buffer_add_utf16' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf16'>
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
-      <parameter type-id='type-id-173' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
+      <parameter type-id='type-id-171' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
       <parameter type-id='type-id-9' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1437' column='1'/>
       <parameter type-id='type-id-12' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1438' column='1'/>
       <parameter type-id='type-id-9' name='item_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1439' column='1'/>
@@ -2329,7 +2322,7 @@
     </function-decl>
     <function-decl name='hb_buffer_add_utf32' mangled-name='hb_buffer_add_utf32' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf32'>
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
-      <parameter type-id='type-id-169' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
+      <parameter type-id='type-id-167' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
       <parameter type-id='type-id-9' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1459' column='1'/>
       <parameter type-id='type-id-12' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1460' column='1'/>
       <parameter type-id='type-id-9' name='item_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1461' column='1'/>
@@ -2349,51 +2342,51 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-180'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-178'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-46' size-in-bits='8' id='type-id-167'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-46' size-in-bits='8' id='type-id-165'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-182'>
+    <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-183' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='214' column='1'/>
+        <var-decl name='next' type-id='type-id-181' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='214' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='lang' type-id='type-id-107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='215' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN18hb_language_item_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
+          <parameter type-id='type-id-181' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='operator==' mangled-name='_ZNK18hb_language_item_teqEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-184' is-artificial='yes'/>
+          <parameter type-id='type-id-182' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='operator=' mangled-name='_ZN18hb_language_item_taSEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
+          <parameter type-id='type-id-181' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
-          <return type-id='type-id-185'/>
+          <return type-id='type-id-183'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-186'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-184'/>
-    <reference-type-def kind='lvalue' type-id='type-id-182' size-in-bits='64' id='type-id-185'/>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-183'/>
+    <qualified-type-def type-id='type-id-180' const='yes' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-182'/>
+    <reference-type-def kind='lvalue' type-id='type-id-180' size-in-bits='64' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-181'/>
     <function-decl name='hb_tag_from_string' mangled-name='hb_tag_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_tag_from_string'>
       <parameter type-id='type-id-15' name='str' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='70' column='1'/>
       <parameter type-id='type-id-9' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='70' column='1'/>
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-185'/>
     </function-decl>
     <function-decl name='hb_tag_to_string' mangled-name='hb_tag_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_tag_to_string'>
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='98' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='98' column='1'/>
       <parameter type-id='type-id-45' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='98' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
@@ -2419,7 +2412,7 @@
       <return type-id='type-id-107'/>
     </function-decl>
     <function-decl name='hb_script_from_iso15924_tag' mangled-name='hb_script_from_iso15924_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_from_iso15924_tag'>
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1'/>
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='hb_script_from_string' mangled-name='hb_script_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_from_string'>
@@ -2429,7 +2422,7 @@
     </function-decl>
     <function-decl name='hb_script_to_iso15924_tag' mangled-name='hb_script_to_iso15924_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_to_iso15924_tag'>
       <parameter type-id='type-id-106' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1'/>
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-185'/>
     </function-decl>
     <function-decl name='hb_script_get_horizontal_direction' mangled-name='hb_script_get_horizontal_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_get_horizontal_direction'>
       <parameter type-id='type-id-106' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1'/>
@@ -2450,26 +2443,26 @@
       <parameter type-id='type-id-12' name='micro' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='586' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
-    <typedef-decl name='hb_tag_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-187'/>
+    <typedef-decl name='hb_tag_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-185'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-188' id='type-id-189'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-186' id='type-id-187'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-190' id='type-id-191'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-188' id='type-id-189'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='16' id='type-id-192'>
+    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='16' id='type-id-190'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
-    <class-decl name='hb_face_t' size-in-bits='1472' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='43' column='1' id='type-id-193'>
+    <class-decl name='hb_face_t' size-in-bits='1472' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='43' column='1' id='type-id-191'>
       <member-type access='public'>
-        <class-decl name='plan_node_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='59' column='1' id='type-id-194'>
+        <class-decl name='plan_node_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='59' column='1' id='type-id-192'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='shape_plan' type-id='type-id-195' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='60' column='1'/>
+            <var-decl name='shape_plan' type-id='type-id-193' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='60' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='next' type-id='type-id-196' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='61' column='1'/>
+            <var-decl name='next' type-id='type-id-194' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='61' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -2480,7 +2473,7 @@
         <var-decl name='immutable' type-id='type-id-35' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='reference_table_func' type-id='type-id-197' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='49' column='1'/>
+        <var-decl name='reference_table_func' type-id='type-id-195' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='user_data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='50' column='1'/>
@@ -2498,83 +2491,83 @@
         <var-decl name='num_glyphs' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='shaper_data' type-id='type-id-164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='57' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='shape_plans' type-id='type-id-196' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='62' column='1'/>
+        <var-decl name='shape_plans' type-id='type-id-194' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='62' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='get_num_glyphs' mangled-name='_ZNK9hb_face_t14get_num_glyphsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_upem' mangled-name='_ZNK9hb_face_t8get_upemEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='reference_table' mangled-name='_ZNK9hb_face_t15reference_tableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
+          <parameter type-id='type-id-185'/>
           <return type-id='type-id-57'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='load_num_glyphs' mangled-name='_ZNK9hb_face_t15load_num_glyphsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='load_upem' mangled-name='_ZNK9hb_face_t9load_upemEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-196' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_font_funcs_t' size-in-bits='3072' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='58' column='1' id='type-id-199'>
+    <class-decl name='hb_font_funcs_t' size-in-bits='3072' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='58' column='1' id='type-id-197'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='66' column='1' id='type-id-200'>
+        <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='66' column='1' id='type-id-198'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='glyph' type-id='type-id-201' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph' type-id='type-id-199' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='glyph_h_advance' type-id='type-id-202' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_h_advance' type-id='type-id-200' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='glyph_v_advance' type-id='type-id-203' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_v_advance' type-id='type-id-201' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='glyph_h_origin' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_h_origin' type-id='type-id-202' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
-            <var-decl name='glyph_v_origin' type-id='type-id-205' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_v_origin' type-id='type-id-203' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
-            <var-decl name='glyph_h_kerning' type-id='type-id-206' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_h_kerning' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='384'>
-            <var-decl name='glyph_v_kerning' type-id='type-id-207' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_v_kerning' type-id='type-id-205' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='448'>
-            <var-decl name='glyph_extents' type-id='type-id-208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_extents' type-id='type-id-206' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='512'>
-            <var-decl name='glyph_contour_point' type-id='type-id-209' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_contour_point' type-id='type-id-207' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='576'>
-            <var-decl name='glyph_name' type-id='type-id-210' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_name' type-id='type-id-208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='640'>
-            <var-decl name='glyph_from_name' type-id='type-id-211' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
+            <var-decl name='glyph_from_name' type-id='type-id-209' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='68' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__1' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='72' column='1' id='type-id-212'>
+        <class-decl name='__anonymous_struct__1' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='72' column='1' id='type-id-210'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='glyph' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='74' column='1'/>
           </data-member>
@@ -2611,7 +2604,7 @@
         </class-decl>
       </member-type>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__2' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='78' column='1' id='type-id-213'>
+        <class-decl name='__anonymous_struct__2' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='78' column='1' id='type-id-211'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='glyph' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='80' column='1'/>
           </data-member>
@@ -2654,16 +2647,16 @@
         <var-decl name='immutable' type-id='type-id-35' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='get' type-id='type-id-200' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='70' column='1'/>
+        <var-decl name='get' type-id='type-id-198' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='user_data' type-id='type-id-212' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='76' column='1'/>
+        <var-decl name='user_data' type-id='type-id-210' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='destroy' type-id='type-id-213' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='82' column='1'/>
+        <var-decl name='destroy' type-id='type-id-211' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='82' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-160'>
+    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='92' column='1'/>
       </data-member>
@@ -2671,10 +2664,10 @@
         <var-decl name='immutable' type-id='type-id-35' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='parent' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
+        <var-decl name='parent' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
+        <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='x_scale' type-id='type-id-9' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='100' column='1'/>
@@ -2689,7 +2682,7 @@
         <var-decl name='y_ppem' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='klass' type-id='type-id-163' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
+        <var-decl name='klass' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='user_data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='107' column='1'/>
@@ -2698,18 +2691,18 @@
         <var-decl name='destroy' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='shaper_data' type-id='type-id-164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='get_glyph_h_advance' mangled-name='_ZN9hb_font_t19get_glyph_h_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph' mangled-name='_ZN9hb_font_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-127'/>
@@ -2718,7 +2711,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_name' mangled-name='_ZN9hb_font_t14get_glyph_nameEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-45'/>
           <parameter type-id='type-id-12'/>
@@ -2727,32 +2720,32 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_advance' mangled-name='_ZN9hb_font_t19get_glyph_v_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_h_origin' mangled-name='_ZN9hb_font_t18get_glyph_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_origin' mangled-name='_ZN9hb_font_t18get_glyph_v_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_h_kerning' mangled-name='_ZN9hb_font_t19get_glyph_h_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-103'/>
@@ -2760,7 +2753,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_kerning' mangled-name='_ZN9hb_font_t19get_glyph_v_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-103'/>
@@ -2768,109 +2761,109 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_contour_point' mangled-name='_ZN9hb_font_t23get_glyph_contour_pointEjjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_x_position' mangled-name='_ZN9hb_font_t23parent_scale_x_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-103'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_y_position' mangled-name='_ZN9hb_font_t23parent_scale_y_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-103'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='guess_v_origin_minus_h_origin' mangled-name='_ZN9hb_font_t29guess_v_origin_minus_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='subtract_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t35subtract_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_contour_point_for_origin' mangled-name='_ZN9hb_font_t34get_glyph_contour_point_for_originEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30add_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_kerning_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_kerning_for_directionEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_advance_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_advance_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_distance' mangled-name='_ZN9hb_font_t21parent_scale_distanceEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_extents_for_origin' mangled-name='_ZN9hb_font_t28get_glyph_extents_for_originEj14hb_direction_tP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-166'/>
+          <parameter type-id='type-id-164'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='glyph_from_string' mangled-name='_ZN9hb_font_t17glyph_from_stringEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='375' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-9'/>
           <parameter type-id='type-id-127'/>
@@ -2879,7 +2872,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='glyph_to_string' mangled-name='_ZN9hb_font_t15glyph_to_stringEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-45'/>
           <parameter type-id='type-id-12'/>
@@ -2888,17 +2881,17 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30get_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-105'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_from_name' mangled-name='_ZN9hb_font_t19get_glyph_from_nameEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-9'/>
           <parameter type-id='type-id-127'/>
@@ -2907,37 +2900,37 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_position' mangled-name='_ZN9hb_font_t21parent_scale_positionEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
-          <parameter type-id='type-id-165'/>
-          <parameter type-id='type-id-165'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_x_distance' mangled-name='_ZN9hb_font_t23parent_scale_x_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-103'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_y_distance' mangled-name='_ZN9hb_font_t23parent_scale_y_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-103'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_extents' mangled-name='_ZN9hb_font_t17get_glyph_extentsEjP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <parameter type-id='type-id-166'/>
+          <parameter type-id='type-id-164'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='em_scale' mangled-name='_ZN9hb_font_t8em_scaleEsi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-67'/>
           <parameter type-id='type-id-9'/>
           <return type-id='type-id-103'/>
@@ -2945,27 +2938,27 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='em_scale_y' mangled-name='_ZN9hb_font_t10em_scale_yEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-67'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='em_scale_x' mangled-name='_ZN9hb_font_t10em_scale_xEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-67'/>
           <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='has_glyph' mangled-name='_ZN9hb_font_t9has_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-159' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-35'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_glyph_extents_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='84' column='1' id='type-id-214'>
+    <class-decl name='hb_glyph_extents_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='84' column='1' id='type-id-212'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='x_bearing' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='85' column='1'/>
       </data-member>
@@ -2979,10 +2972,10 @@
         <var-decl name='height' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='88' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_auto_trace_t&lt;0, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-215'>
+    <class-decl name='hb_auto_trace_t&lt;0, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-213'>
       <member-function access='public'>
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-17'/>
@@ -2994,7 +2987,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='ret' mangled-name='_ZN15hb_auto_trace_tILi0EbE3retEbj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-1'/>
@@ -3002,7 +2995,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-17'/>
@@ -3014,7 +3007,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-17'/>
@@ -3026,7 +3019,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-216' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-17'/>
@@ -3037,7 +3030,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_shape_plan_t' size-in-bits='1664' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='36' column='1' id='type-id-217'>
+    <class-decl name='hb_shape_plan_t' size-in-bits='1664' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='36' column='1' id='type-id-215'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='37' column='1'/>
       </data-member>
@@ -3045,30 +3038,30 @@
         <var-decl name='default_shaper_list' type-id='type-id-35' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='face_unsafe' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='41' column='1'/>
+        <var-decl name='face_unsafe' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='props' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='shaper_func' type-id='type-id-218' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='44' column='1'/>
+        <var-decl name='shaper_func' type-id='type-id-216' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <var-decl name='shaper_name' type-id='type-id-15' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='user_features' type-id='type-id-219' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='47' column='1'/>
+        <var-decl name='user_features' type-id='type-id-217' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <var-decl name='num_user_features' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='shaper_data' type-id='type-id-164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='50' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='50' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_feature_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='43' column='1' id='type-id-220'>
+    <class-decl name='hb_feature_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='43' column='1' id='type-id-218'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tag' type-id='type-id-187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='44' column='1'/>
+        <var-decl name='tag' type-id='type-id-185' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='value' type-id='type-id-100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='45' column='1'/>
@@ -3080,7 +3073,7 @@
         <var-decl name='end' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='47' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_shaper_data_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='53' column='1' id='type-id-164'>
+    <class-decl name='hb_shaper_data_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='53' column='1' id='type-id-162'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ot' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='43' column='1'/>
       </data-member>
@@ -3088,6 +3081,7 @@
         <var-decl name='fallback' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='54' column='1'/>
       </data-member>
     </class-decl>
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
     <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
     <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
     <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-226'/>
@@ -3099,106 +3093,106 @@
     <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-238'/>
     <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-240'/>
     <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-244'/>
-    <reference-type-def kind='lvalue' type-id='type-id-245' size-in-bits='64' id='type-id-246'/>
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-247'/>
-    <reference-type-def kind='lvalue' type-id='type-id-188' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-249'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
-    <reference-type-def kind='lvalue' type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
+    <reference-type-def kind='lvalue' type-id='type-id-243' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-245'/>
+    <reference-type-def kind='lvalue' type-id='type-id-186' size-in-bits='64' id='type-id-246'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-247'/>
+    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-249'/>
+    <reference-type-def kind='lvalue' type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
+    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
     <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-256'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
     <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-262'/>
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
+    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-267'/>
     <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-268'/>
     <qualified-type-def type-id='type-id-221' const='yes' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
-    <qualified-type-def type-id='type-id-223' const='yes' id='type-id-271'/>
-    <reference-type-def kind='lvalue' type-id='type-id-271' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-273'/>
-    <qualified-type-def type-id='type-id-225' const='yes' id='type-id-274'/>
-    <reference-type-def kind='lvalue' type-id='type-id-274' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-276'/>
-    <qualified-type-def type-id='type-id-227' const='yes' id='type-id-277'/>
-    <reference-type-def kind='lvalue' type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-279'/>
-    <qualified-type-def type-id='type-id-229' const='yes' id='type-id-280'/>
-    <reference-type-def kind='lvalue' type-id='type-id-280' size-in-bits='64' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-282'/>
+    <reference-type-def kind='lvalue' type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-223' const='yes' id='type-id-272'/>
+    <reference-type-def kind='lvalue' type-id='type-id-272' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-274'/>
+    <qualified-type-def type-id='type-id-225' const='yes' id='type-id-275'/>
+    <reference-type-def kind='lvalue' type-id='type-id-275' size-in-bits='64' id='type-id-276'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-277'/>
+    <qualified-type-def type-id='type-id-227' const='yes' id='type-id-278'/>
+    <reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-280'/>
+    <qualified-type-def type-id='type-id-229' const='yes' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
     <qualified-type-def type-id='type-id-231' const='yes' id='type-id-283'/>
     <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
     <qualified-type-def type-id='type-id-233' const='yes' id='type-id-285'/>
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
-    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-287'/>
-    <reference-type-def kind='lvalue' type-id='type-id-287' size-in-bits='64' id='type-id-288'/>
-    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-289'/>
-    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-290'/>
-    <reference-type-def kind='lvalue' type-id='type-id-290' size-in-bits='64' id='type-id-291'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-292'/>
-    <qualified-type-def type-id='type-id-239' const='yes' id='type-id-293'/>
-    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-294'/>
-    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-295'/>
-    <qualified-type-def type-id='type-id-241' const='yes' id='type-id-296'/>
-    <reference-type-def kind='lvalue' type-id='type-id-296' size-in-bits='64' id='type-id-297'/>
-    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-298'/>
-    <qualified-type-def type-id='type-id-243' const='yes' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-300'/>
-    <qualified-type-def type-id='type-id-301' const='yes' id='type-id-302'/>
-    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-303'/>
-    <qualified-type-def type-id='type-id-245' const='yes' id='type-id-304'/>
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-306'/>
-    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-307'/>
-    <reference-type-def kind='lvalue' type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-309'/>
-    <qualified-type-def type-id='type-id-310' const='yes' id='type-id-311'/>
-    <reference-type-def kind='lvalue' type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
-    <qualified-type-def type-id='type-id-250' const='yes' id='type-id-313'/>
+    <reference-type-def kind='lvalue' type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-287'/>
+    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-288'/>
+    <reference-type-def kind='lvalue' type-id='type-id-288' size-in-bits='64' id='type-id-289'/>
+    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-290'/>
+    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-291'/>
+    <reference-type-def kind='lvalue' type-id='type-id-291' size-in-bits='64' id='type-id-292'/>
+    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-293'/>
+    <qualified-type-def type-id='type-id-239' const='yes' id='type-id-294'/>
+    <reference-type-def kind='lvalue' type-id='type-id-294' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-296'/>
+    <qualified-type-def type-id='type-id-241' const='yes' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
+    <qualified-type-def type-id='type-id-299' const='yes' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-301'/>
+    <qualified-type-def type-id='type-id-243' const='yes' id='type-id-302'/>
+    <reference-type-def kind='lvalue' type-id='type-id-302' size-in-bits='64' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-304'/>
+    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-305'/>
+    <reference-type-def kind='lvalue' type-id='type-id-305' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-307'/>
+    <qualified-type-def type-id='type-id-308' const='yes' id='type-id-309'/>
+    <reference-type-def kind='lvalue' type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-311'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
+    <qualified-type-def type-id='type-id-252' const='yes' id='type-id-313'/>
     <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-314'/>
     <qualified-type-def type-id='type-id-254' const='yes' id='type-id-315'/>
     <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-316'/>
-    <qualified-type-def type-id='type-id-256' const='yes' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
-    <qualified-type-def type-id='type-id-190' const='yes' id='type-id-319'/>
-    <reference-type-def kind='lvalue' type-id='type-id-319' size-in-bits='64' id='type-id-320'/>
-    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-321'/>
-    <qualified-type-def type-id='type-id-259' const='yes' id='type-id-322'/>
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-323'/>
-    <qualified-type-def type-id='type-id-324' const='yes' id='type-id-325'/>
+    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-317'/>
+    <reference-type-def kind='lvalue' type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-319'/>
+    <qualified-type-def type-id='type-id-257' const='yes' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-321'/>
+    <qualified-type-def type-id='type-id-322' const='yes' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-324'/>
+    <qualified-type-def type-id='type-id-259' const='yes' id='type-id-325'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
-    <qualified-type-def type-id='type-id-261' const='yes' id='type-id-327'/>
+    <qualified-type-def type-id='type-id-263' const='yes' id='type-id-327'/>
     <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-328'/>
     <qualified-type-def type-id='type-id-265' const='yes' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-330'/>
-    <qualified-type-def type-id='type-id-267' const='yes' id='type-id-331'/>
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-332'/>
-    <qualified-type-def type-id='type-id-193' const='yes' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-198'/>
-    <qualified-type-def type-id='type-id-334' const='yes' id='type-id-335'/>
+    <qualified-type-def type-id='type-id-191' const='yes' id='type-id-331'/>
+    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-196'/>
+    <qualified-type-def type-id='type-id-332' const='yes' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-334'/>
+    <qualified-type-def type-id='type-id-197' const='yes' id='type-id-335'/>
     <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-336'/>
-    <qualified-type-def type-id='type-id-199' const='yes' id='type-id-337'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-337'/>
     <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
-    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-339'/>
+    <qualified-type-def type-id='type-id-215' const='yes' id='type-id-339'/>
     <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-340'/>
-    <qualified-type-def type-id='type-id-217' const='yes' id='type-id-341'/>
-    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
-    <qualified-type-def type-id='type-id-187' const='yes' id='type-id-343'/>
-    <qualified-type-def type-id='type-id-9' const='yes' id='type-id-344'/>
-    <reference-type-def kind='lvalue' type-id='type-id-344' size-in-bits='64' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-347'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-194' size-in-bits='64' id='type-id-196'/>
-    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-219'/>
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-195'/>
+    <qualified-type-def type-id='type-id-185' const='yes' id='type-id-341'/>
+    <qualified-type-def type-id='type-id-9' const='yes' id='type-id-342'/>
+    <reference-type-def kind='lvalue' type-id='type-id-342' size-in-bits='64' id='type-id-343'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-345'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-194'/>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-217'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-216'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-193'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
     <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-354'/>
     <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
     <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-358'/>
@@ -3206,32 +3200,31 @@
     <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
     <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-366'/>
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-368'/>
-    <type-decl name='variadic parameter type' id='type-id-369'/>
+    <type-decl name='variadic parameter type' id='type-id-367'/>
     <function-decl name='hb_face_create_for_tables' mangled-name='hb_face_create_for_tables' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create_for_tables'>
-      <parameter type-id='type-id-197' name='reference_table_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1'/>
+      <parameter type-id='type-id-195' name='reference_table_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='84' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='85' column='1'/>
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_face_create' mangled-name='hb_face_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create'>
       <parameter type-id='type-id-57' name='blob' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='163' column='1'/>
       <parameter type-id='type-id-12' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='164' column='1'/>
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_face_get_empty' mangled-name='hb_face_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_empty'>
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_face_reference' mangled-name='hb_face_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1'/>
-      <return type-id='type-id-162'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_face_destroy' mangled-name='hb_face_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_destroy'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='226' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='226' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_face_set_user_data' mangled-name='hb_face_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_user_data'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1'/>
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='264' column='1'/>
       <parameter type-id='type-id-17' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='265' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='266' column='1'/>
@@ -3239,85 +3232,85 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_face_get_user_data' mangled-name='hb_face_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_user_data'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1'/>
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='285' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='hb_face_make_immutable' mangled-name='hb_face_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_make_immutable'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_face_is_immutable' mangled-name='hb_face_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_is_immutable'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_face_reference_table' mangled-name='hb_face_reference_table' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference_table'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1'/>
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='337' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='337' column='1'/>
       <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='hb_face_reference_blob' mangled-name='hb_face_reference_blob' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference_blob'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1'/>
       <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='hb_face_set_index' mangled-name='hb_face_set_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_index'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
       <parameter type-id='type-id-12' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='369' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_face_get_index' mangled-name='hb_face_get_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_index'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_face_set_upem' mangled-name='hb_face_set_upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_upem'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='403' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='403' column='1'/>
       <parameter type-id='type-id-12' name='upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='404' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_face_get_upem' mangled-name='hb_face_get_upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_upem'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='423' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='423' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_face_set_glyph_count' mangled-name='hb_face_set_glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_glyph_count'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='447' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='447' column='1'/>
       <parameter type-id='type-id-12' name='glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='448' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_face_get_glyph_count' mangled-name='hb_face_get_glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_glyph_count'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='467' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='467' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <typedef-decl name='hb_face_t' type-id='type-id-193' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-348'/>
-    <typedef-decl name='hb_reference_table_func_t' type-id='type-id-347' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-197'/>
-    <typedef-decl name='hb_font_funcs_t' type-id='type-id-199' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-349'/>
-    <typedef-decl name='hb_glyph_extents_t' type-id='type-id-214' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-350'/>
-    <typedef-decl name='hb_font_get_glyph_func_t' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='97' column='1' id='type-id-201'/>
-    <typedef-decl name='hb_font_get_glyph_advance_func_t' type-id='type-id-368' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='102' column='1' id='type-id-370'/>
-    <typedef-decl name='hb_font_get_glyph_h_advance_func_t' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='103' column='1' id='type-id-202'/>
-    <typedef-decl name='hb_font_get_glyph_v_advance_func_t' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='104' column='1' id='type-id-203'/>
-    <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-360' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-371'/>
-    <typedef-decl name='hb_font_get_glyph_h_origin_func_t' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='110' column='1' id='type-id-204'/>
-    <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-205'/>
-    <typedef-decl name='hb_font_get_glyph_kerning_func_t' type-id='type-id-366' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='115' column='1' id='type-id-372'/>
-    <typedef-decl name='hb_font_get_glyph_h_kerning_func_t' type-id='type-id-372' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='116' column='1' id='type-id-206'/>
-    <typedef-decl name='hb_font_get_glyph_v_kerning_func_t' type-id='type-id-372' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='117' column='1' id='type-id-207'/>
-    <typedef-decl name='hb_font_get_glyph_extents_func_t' type-id='type-id-358' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='123' column='1' id='type-id-208'/>
-    <typedef-decl name='hb_font_get_glyph_contour_point_func_t' type-id='type-id-364' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='127' column='1' id='type-id-209'/>
-    <typedef-decl name='hb_font_get_glyph_name_func_t' type-id='type-id-356' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='133' column='1' id='type-id-210'/>
-    <typedef-decl name='hb_font_get_glyph_from_name_func_t' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='137' column='1' id='type-id-211'/>
+    <typedef-decl name='hb_face_t' type-id='type-id-191' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-346'/>
+    <typedef-decl name='hb_reference_table_func_t' type-id='type-id-345' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-195'/>
+    <typedef-decl name='hb_font_funcs_t' type-id='type-id-197' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-347'/>
+    <typedef-decl name='hb_glyph_extents_t' type-id='type-id-212' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-348'/>
+    <typedef-decl name='hb_font_get_glyph_func_t' type-id='type-id-360' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='97' column='1' id='type-id-199'/>
+    <typedef-decl name='hb_font_get_glyph_advance_func_t' type-id='type-id-366' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='102' column='1' id='type-id-368'/>
+    <typedef-decl name='hb_font_get_glyph_h_advance_func_t' type-id='type-id-368' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='103' column='1' id='type-id-200'/>
+    <typedef-decl name='hb_font_get_glyph_v_advance_func_t' type-id='type-id-368' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='104' column='1' id='type-id-201'/>
+    <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-358' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-369'/>
+    <typedef-decl name='hb_font_get_glyph_h_origin_func_t' type-id='type-id-369' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='110' column='1' id='type-id-202'/>
+    <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-369' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-203'/>
+    <typedef-decl name='hb_font_get_glyph_kerning_func_t' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='115' column='1' id='type-id-370'/>
+    <typedef-decl name='hb_font_get_glyph_h_kerning_func_t' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='116' column='1' id='type-id-204'/>
+    <typedef-decl name='hb_font_get_glyph_v_kerning_func_t' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='117' column='1' id='type-id-205'/>
+    <typedef-decl name='hb_font_get_glyph_extents_func_t' type-id='type-id-356' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='123' column='1' id='type-id-206'/>
+    <typedef-decl name='hb_font_get_glyph_contour_point_func_t' type-id='type-id-364' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='127' column='1' id='type-id-207'/>
+    <typedef-decl name='hb_font_get_glyph_name_func_t' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='133' column='1' id='type-id-208'/>
+    <typedef-decl name='hb_font_get_glyph_from_name_func_t' type-id='type-id-352' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='137' column='1' id='type-id-209'/>
     <namespace-decl name='OT'>
-      <class-decl name='TableRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='55' column='1' id='type-id-190'>
+      <class-decl name='TableRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='55' column='1' id='type-id-188'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='61' column='1'/>
+          <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='checkSum' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='62' column='1'/>
+          <var-decl name='checkSum' type-id='type-id-229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='offset' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='63' column='1'/>
+          <var-decl name='offset' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='63' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
-          <var-decl name='length' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='65' column='1'/>
+          <var-decl name='length' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='65' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
@@ -3326,181 +3319,181 @@
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='OffsetTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='71' column='1' id='type-id-245'>
+      <class-decl name='OffsetTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='71' column='1' id='type-id-243'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='sfnt_version' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='111' column='1'/>
+          <var-decl name='sfnt_version' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='111' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='numTables' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='112' column='1'/>
+          <var-decl name='numTables' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='112' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='searchRangeZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='113' column='1'/>
+          <var-decl name='searchRangeZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='113' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='entrySelectorZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='114' column='1'/>
+          <var-decl name='entrySelectorZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='114' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='rangeShiftZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='115' column='1'/>
+          <var-decl name='rangeShiftZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='115' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='tables' type-id='type-id-191' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='116' column='1'/>
+          <var-decl name='tables' type-id='type-id-189' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='116' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='118' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='find_table_index' mangled-name='_ZNK2OT11OffsetTable16find_table_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-306' is-artificial='yes'/>
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-304' is-artificial='yes'/>
+            <parameter type-id='type-id-185'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_table' mangled-name='_ZNK2OT11OffsetTable9get_tableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-306' is-artificial='yes'/>
+            <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-320'/>
+            <return type-id='type-id-318'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_table_by_tag' mangled-name='_ZNK2OT11OffsetTable16get_table_by_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-306' is-artificial='yes'/>
-            <parameter type-id='type-id-187'/>
-            <return type-id='type-id-320'/>
+            <parameter type-id='type-id-304' is-artificial='yes'/>
+            <parameter type-id='type-id-185'/>
+            <return type-id='type-id-318'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT11OffsetTable8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-247' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-245' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='TTCHeaderVersion1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='127' column='1' id='type-id-256'>
+      <class-decl name='TTCHeaderVersion1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='127' column='1' id='type-id-254'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='ttcTag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='139' column='1'/>
+          <var-decl name='ttcTag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='139' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='140' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='140' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='table' type-id='type-id-221' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='143' column='1'/>
+          <var-decl name='table' type-id='type-id-219' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='143' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='146' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17TTCHeaderVersion18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-257' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-255' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_face' mangled-name='_ZNK2OT17TTCHeaderVersion18get_faceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-318' is-artificial='yes'/>
+            <parameter type-id='type-id-316' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-312'/>
+            <return type-id='type-id-310'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='TTCHeader' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='150' column='1' id='type-id-254'>
+      <class-decl name='TTCHeader' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='150' column='1' id='type-id-252'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='183' column='1' id='type-id-374'>
+          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='183' column='1' id='type-id-372'>
             <member-type access='public'>
-              <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='184' column='1' id='type-id-375'>
+              <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='184' column='1' id='type-id-373'>
                 <data-member access='public' layout-offset-in-bits='0'>
-                  <var-decl name='ttcTag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='185' column='1'/>
+                  <var-decl name='ttcTag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='185' column='1'/>
                 </data-member>
                 <data-member access='public' layout-offset-in-bits='32'>
-                  <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='186' column='1'/>
+                  <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='186' column='1'/>
                 </data-member>
               </class-decl>
             </member-type>
             <data-member access='public'>
-              <var-decl name='header' type-id='type-id-375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='188' column='1'/>
+              <var-decl name='header' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='188' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='version1' type-id='type-id-256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='189' column='1'/>
+              <var-decl name='version1' type-id='type-id-254' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='189' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='190' column='1'/>
+          <var-decl name='u' type-id='type-id-372' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='190' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9TTCHeader8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-255' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-253' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_face' mangled-name='_ZNK2OT9TTCHeader8get_faceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-316' is-artificial='yes'/>
+            <parameter type-id='type-id-314' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-312'/>
+            <return type-id='type-id-310'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OpenTypeFontFile' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='199' column='1' id='type-id-250'>
+      <class-decl name='OpenTypeFontFile' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='199' column='1' id='type-id-248'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='224' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='250' column='1' id='type-id-376'>
+          <union-decl name='__anonymous_union__' size-in-bits='224' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='250' column='1' id='type-id-374'>
             <data-member access='public'>
-              <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='251' column='1'/>
+              <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='251' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='fontFace' type-id='type-id-310' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='252' column='1'/>
+              <var-decl name='fontFace' type-id='type-id-308' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='252' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='ttcHeader' type-id='type-id-254' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='253' column='1'/>
+              <var-decl name='ttcHeader' type-id='type-id-252' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='253' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='200' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='200' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='CFFTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='202' column='1'/>
+          <var-decl name='CFFTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='202' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='TrueTypeTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='203' column='1'/>
+          <var-decl name='TrueTypeTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='203' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='TTCTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='204' column='1'/>
+          <var-decl name='TTCTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='204' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='TrueTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='205' column='1'/>
+          <var-decl name='TrueTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='205' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='Typ1Tag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='206' column='1'/>
+          <var-decl name='Typ1Tag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='206' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='254' column='1'/>
+          <var-decl name='u' type-id='type-id-374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='254' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_face' mangled-name='_ZNK2OT16OpenTypeFontFile8get_faceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-314' is-artificial='yes'/>
+            <parameter type-id='type-id-312' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-312'/>
+            <return type-id='type-id-310'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT16OpenTypeFontFile8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-251' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-249' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_sanitize_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='178' column='1' id='type-id-261'>
+      <class-decl name='hb_sanitize_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='178' column='1' id='type-id-259'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='181' column='1' id='type-id-377'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='181' column='1' id='type-id-375'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='180' column='1'/>
@@ -3525,64 +3518,64 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-249'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-247'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::maxp&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-332'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-330'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::head&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-330'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-328'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-298'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-296'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-306'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-304'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::FixedVersion&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-286'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-284'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-270'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-268'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-309'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-307'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='may_edit' mangled-name='_ZN2OT21hb_sanitize_context_t8may_editEPKvj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -3590,7 +3583,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='check_range' mangled-name='_ZNK2OT21hb_sanitize_context_t11check_rangeEPKvj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -3598,32 +3591,32 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT21hb_sanitize_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='init' mangled-name='_ZN2OT21hb_sanitize_context_t4initEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <parameter type-id='type-id-57'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='start_processing' mangled-name='_ZN2OT21hb_sanitize_context_t16start_processingEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end_processing' mangled-name='_ZN2OT21hb_sanitize_context_t14end_processingEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_array' mangled-name='_ZNK2OT21hb_sanitize_context_t11check_arrayEPKvjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-12'/>
@@ -3632,1185 +3625,1185 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-378'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-376'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-379'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-380'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-378'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-381'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-379'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-293'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CmapSubtableFormat0&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-382'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-380'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CmapSubtableFormat4&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-383'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::USHORT, uint16_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-384'/>
-            <parameter type-id='type-id-385'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-382'/>
+            <parameter type-id='type-id-383'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-386'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-384'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-387'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-385'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-388'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-386'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-389'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-387'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-390'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-388'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-391'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-389'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-392'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-390'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-393'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-391'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-392'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-395'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-393'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-396'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-394'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-397'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::VariationSelectorRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-398'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-396'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CmapSubtableFormat14&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-397'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-400'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-398'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::EncodingRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-401'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-399'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::cmap&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-402'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-400'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::_hea&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-403'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-401'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-404'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-402'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-405'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-403'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-406'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-404'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-407'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-405'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-408'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-406'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-409'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-410'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-408'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-411'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-409'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-412'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-410'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-413'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-411'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-414'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-412'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-415'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-416'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-414'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-417'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-415'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-418'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-416'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-419'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-417'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-420'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-418'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-421'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-419'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-422'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-420'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-423'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-421'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-424'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-422'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-425'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-423'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-426'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-424'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-427'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-425'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-428'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-426'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-429'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-427'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-430'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-428'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-431'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-429'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-432'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-430'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-433'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-431'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-434'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-432'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-435'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-433'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-436'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-434'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-437'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-435'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-438'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-436'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-439'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-437'/>
+            <parameter type-id='type-id-343'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::FixedVersion&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-286'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-284'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-293'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-386'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-384'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-440'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-438'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-441'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-439'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-442'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-440'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-443'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-441'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-444'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-442'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-445'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-443'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-446'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-444'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CaretValueFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-447'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-445'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CaretValueFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-448'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-446'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::Device&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-449'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-447'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-450'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-448'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::CaretValueFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-451'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-449'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-452'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-450'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-453'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-451'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-454'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-452'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ClassDefFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-455'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-453'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-456'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-454'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-457'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-455'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-458'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-456'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-459'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-457'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-460'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-458'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-461'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-459'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::LangSys&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-462'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-460'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-463'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-461'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-464'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-462'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::Record&lt;OT::LangSys&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-465'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-463'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-466'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-464'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::Record&lt;OT::Script&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-467'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-465'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-468'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-466'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-469'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-467'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::FeatureParamsSize&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-470'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-468'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::FeatureParamsStylisticSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-471'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-469'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-470'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::FeatureParamsCharacterVariants&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-473'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-471'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-474'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-472'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::Feature&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-475'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-473'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='try_set&lt;OT::OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-405'/>
-            <parameter type-id='type-id-476'/>
+            <parameter type-id='type-id-260' is-artificial='yes'/>
+            <parameter type-id='type-id-403'/>
+            <parameter type-id='type-id-474'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-477'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-475'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::Record&lt;OT::Feature&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-478'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-476'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-479'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-477'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-480'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-478'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-479'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::Lookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-482'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-480'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-483'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-484'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-482'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-485'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-483'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-486'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-484'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::IntType&lt;short int, 2u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-292'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-290'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-487'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-485'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-488'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-486'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-489'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-487'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-490'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-488'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-491'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-489'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-490'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-493'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-491'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-494'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-492'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-495'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-493'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-496'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-494'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-497'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-495'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-498'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-496'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-499'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-497'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-500'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-498'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-501'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-499'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-502'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-500'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-503'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-501'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-504'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-502'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ExtensionFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-505'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-503'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-506'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-504'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-507'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-505'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-508'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-506'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-509'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-507'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-508'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-511'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-509'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::PairSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-510'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-513'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-511'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-514'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-512'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::AnchorFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-515'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-513'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::AnchorFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-516'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-514'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::AnchorFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-517'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-515'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-518'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-516'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-517'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::MarkRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-520'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-518'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-521'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-519'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::AnchorMatrix&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-522'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-520'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-523'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-521'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-524'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-522'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-525'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-523'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-526'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-524'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-525'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-528'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-526'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-529'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-527'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-530'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-528'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-531'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-529'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-532'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-530'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-533'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-531'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-534'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-532'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_struct&lt;OT::OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <parameter type-id='type-id-535'/>
+            <parameter type-id='type-id-326' is-artificial='yes'/>
+            <parameter type-id='type-id-533'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Sanitizer&lt;OT::OpenTypeFontFile&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-536'>
+      <class-decl name='Sanitizer&lt;OT::OpenTypeFontFile&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-534'>
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_16OpenTypeFontFileEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
-            <return type-id='type-id-314'/>
+            <return type-id='type-id-312'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -4820,7 +4813,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Sanitizer&lt;OT::head&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-537'>
+      <class-decl name='Sanitizer&lt;OT::head&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-535'>
         <member-function access='public' static='yes'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4headEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
@@ -4830,11 +4823,11 @@
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_4headEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
-            <return type-id='type-id-330'/>
+            <return type-id='type-id-328'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Sanitizer&lt;OT::maxp&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-538'>
+      <class-decl name='Sanitizer&lt;OT::maxp&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-536'>
         <member-function access='public' static='yes'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4maxpEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
@@ -4844,11 +4837,11 @@
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_4maxpEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
-            <return type-id='type-id-332'/>
+            <return type-id='type-id-330'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_serialize_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='377' column='1' id='type-id-263'>
+      <class-decl name='hb_serialize_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='377' column='1' id='type-id-261'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='debug_depth' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='480' column='1'/>
         </data-member>
@@ -4866,7 +4859,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
@@ -4874,7 +4867,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
@@ -4882,7 +4875,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
@@ -4890,7 +4883,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
@@ -4898,403 +4891,403 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='start_embed&lt;OT::Coverage&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <return type-id='type-id-539'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <return type-id='type-id-537'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='start_embed&lt;OT::Ligature&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <return type-id='type-id-540'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <return type-id='type-id-538'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='start_embed&lt;OT::LigatureSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <return type-id='type-id-541'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <return type-id='type-id-539'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='start_embed&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <return type-id='type-id-542'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <return type-id='type-id-540'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='start_embed&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='440' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <return type-id='type-id-543'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <return type-id='type-id-541'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::Lookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-544'/>
+            <return type-id='type-id-542'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-545'/>
+            <return type-id='type-id-543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-546'/>
-            <return type-id='type-id-545'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-544'/>
+            <return type-id='type-id-543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend&lt;OT::ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-546'/>
-            <return type-id='type-id-545'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-544'/>
+            <return type-id='type-id-543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::Lookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-547'/>
-            <return type-id='type-id-544'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-545'/>
+            <return type-id='type-id-542'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-240'/>
+            <return type-id='type-id-238'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-548'/>
+            <return type-id='type-id-546'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::Coverage&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-539'/>
+            <return type-id='type-id-537'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::CoverageFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-549'/>
+            <return type-id='type-id-547'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-550'/>
+            <return type-id='type-id-548'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::CoverageFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-551'/>
-            <return type-id='type-id-549'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-549'/>
+            <return type-id='type-id-547'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend&lt;OT::SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-552'/>
-            <return type-id='type-id-550'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-550'/>
+            <return type-id='type-id-548'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::CoverageFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-553'/>
+            <return type-id='type-id-551'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-554'/>
+            <return type-id='type-id-552'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::CoverageFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-555'/>
-            <return type-id='type-id-553'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-553'/>
+            <return type-id='type-id-551'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend&lt;OT::SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-556'/>
-            <return type-id='type-id-554'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-554'/>
+            <return type-id='type-id-552'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::Coverage&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-557'/>
-            <return type-id='type-id-539'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-555'/>
+            <return type-id='type-id-537'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-558'/>
-            <return type-id='type-id-548'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-556'/>
+            <return type-id='type-id-546'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-559'/>
+            <return type-id='type-id-557'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-560'/>
+            <return type-id='type-id-558'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-561'/>
-            <return type-id='type-id-560'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-559'/>
+            <return type-id='type-id-558'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-561'/>
-            <return type-id='type-id-560'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-559'/>
+            <return type-id='type-id-558'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-562'/>
-            <return type-id='type-id-559'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-560'/>
+            <return type-id='type-id-557'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-563'/>
+            <return type-id='type-id-561'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-564'/>
+            <return type-id='type-id-562'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-565'/>
-            <return type-id='type-id-564'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-563'/>
+            <return type-id='type-id-562'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-565'/>
-            <return type-id='type-id-564'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-563'/>
+            <return type-id='type-id-562'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::LigatureSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-541'/>
+            <return type-id='type-id-539'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-566'/>
+            <return type-id='type-id-564'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-567'/>
-            <return type-id='type-id-566'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-565'/>
+            <return type-id='type-id-564'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend&lt;OT::ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-567'/>
-            <return type-id='type-id-566'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-565'/>
+            <return type-id='type-id-564'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::Ligature&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-540'/>
+            <return type-id='type-id-538'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate_size&lt;OT::HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-568'/>
+            <return type-id='type-id-566'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-569'/>
-            <return type-id='type-id-568'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-567'/>
+            <return type-id='type-id-566'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend&lt;OT::HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-569'/>
-            <return type-id='type-id-568'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-567'/>
+            <return type-id='type-id-566'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::Ligature&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-570'/>
-            <return type-id='type-id-540'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-568'/>
+            <return type-id='type-id-538'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::LigatureSet&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-571'/>
-            <return type-id='type-id-541'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-569'/>
+            <return type-id='type-id-539'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-572'/>
-            <return type-id='type-id-563'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-570'/>
+            <return type-id='type-id-561'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='start_serialize&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <return type-id='type-id-543'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <return type-id='type-id-541'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='extend_min&lt;OT::USHORT&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <parameter type-id='type-id-573'/>
-            <return type-id='type-id-384'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-571'/>
+            <return type-id='type-id-382'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='copy&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='410' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
-            <return type-id='type-id-543'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <return type-id='type-id-541'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end_serialize' mangled-name='_ZN2OT22hb_serialize_context_t13end_serializeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_serialize_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-262' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BEInt&lt;int, 4&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-223'>
+      <class-decl name='BEInt&lt;int, 4&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-221'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='v' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='BEInt&lt;short int, 2&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-225'>
+      <class-decl name='BEInt&lt;short int, 2&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-223'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='554' column='1'/>
+          <var-decl name='v' type-id='type-id-190' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='554' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator short int' mangled-name='_ZNK2OT5BEIntIsLi2EEcvsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-276' is-artificial='yes'/>
+            <parameter type-id='type-id-274' is-artificial='yes'/>
             <return type-id='type-id-72'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT5BEIntIsLi2EE3setEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-226' is-artificial='yes'/>
+            <parameter type-id='type-id-224' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BEInt&lt;short unsigned int, 2&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-227'>
+      <class-decl name='BEInt&lt;short unsigned int, 2&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-225'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='554' column='1'/>
+          <var-decl name='v' type-id='type-id-190' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='554' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator short unsigned int' mangled-name='_ZNK2OT5BEIntItLi2EEcvtEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-279' is-artificial='yes'/>
+            <parameter type-id='type-id-277' is-artificial='yes'/>
             <return type-id='type-id-81'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT5BEIntItLi2EE3setEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-228' is-artificial='yes'/>
+            <parameter type-id='type-id-226' is-artificial='yes'/>
             <parameter type-id='type-id-81'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BEInt&lt;unsigned int, 4&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-229'>
+      <class-decl name='BEInt&lt;unsigned int, 4&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-227'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='v' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator unsigned int' mangled-name='_ZNK2OT5BEIntIjLi4EEcvjEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='592' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
+            <parameter type-id='type-id-280' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT5BEIntIjLi4EE3setEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-230' is-artificial='yes'/>
+            <parameter type-id='type-id-228' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNK2OT5BEIntIjLi4EEeqERKS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='599' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
-            <parameter type-id='type-id-281'/>
+            <parameter type-id='type-id-280' is-artificial='yes'/>
+            <parameter type-id='type-id-279'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='IntType&lt;int, 4u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-235'>
+      <class-decl name='IntType&lt;int, 4u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-233'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-223' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-221' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
@@ -5303,9 +5296,9 @@
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='IntType&lt;short int, 2u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-237'>
+      <class-decl name='IntType&lt;short int, 2u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-235'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-225' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-223' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
@@ -5315,28 +5308,28 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator short int' mangled-name='_ZNK2OT7IntTypeIsLj2EEcvsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-292' is-artificial='yes'/>
+            <parameter type-id='type-id-290' is-artificial='yes'/>
             <return type-id='type-id-72'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7IntTypeIsLj2EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-238' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-236' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeIsLj2EE3setEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-238' is-artificial='yes'/>
+            <parameter type-id='type-id-236' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='IntType&lt;short unsigned int, 2u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-239'>
+      <class-decl name='IntType&lt;short unsigned int, 2u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-237'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-227' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-225' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
@@ -5346,49 +5339,49 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator short unsigned int' mangled-name='_ZNK2OT7IntTypeItLj2EEcvtEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-295' is-artificial='yes'/>
+            <parameter type-id='type-id-293' is-artificial='yes'/>
             <return type-id='type-id-81'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeItLj2EE3cmpES1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='619' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-295' is-artificial='yes'/>
-            <parameter type-id='type-id-239'/>
+            <parameter type-id='type-id-293' is-artificial='yes'/>
+            <parameter type-id='type-id-237'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeItLj2EE3setEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-240' is-artificial='yes'/>
+            <parameter type-id='type-id-238' is-artificial='yes'/>
             <parameter type-id='type-id-81'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7IntTypeItLj2EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-240' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-238' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeItLj2EE3cmpEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-295' is-artificial='yes'/>
+            <parameter type-id='type-id-293' is-artificial='yes'/>
             <parameter type-id='type-id-81'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='cmp' mangled-name='_ZN2OT7IntTypeItLj2EE3cmpEPKS1_S3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-295'/>
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-293'/>
+            <parameter type-id='type-id-293'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='IntType&lt;unsigned int, 4u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-241'>
+      <class-decl name='IntType&lt;unsigned int, 4u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-239'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-227' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
@@ -5398,45 +5391,45 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeIjLj4EE3setEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-242' is-artificial='yes'/>
+            <parameter type-id='type-id-240' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNK2OT7IntTypeIjLj4EEeqERKS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='616' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-298' is-artificial='yes'/>
-            <parameter type-id='type-id-297'/>
+            <parameter type-id='type-id-296' is-artificial='yes'/>
+            <parameter type-id='type-id-295'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator unsigned int' mangled-name='_ZNK2OT7IntTypeIjLj4EEcvjEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-298' is-artificial='yes'/>
+            <parameter type-id='type-id-296' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7IntTypeIjLj4EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-242' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-240' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeIjLj4EE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-298' is-artificial='yes'/>
+            <parameter type-id='type-id-296' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LONGDATETIME' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='647' column='1' id='type-id-243'>
+      <class-decl name='LONGDATETIME' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='647' column='1' id='type-id-241'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='major' type-id='type-id-574' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='653' column='1'/>
+          <var-decl name='major' type-id='type-id-572' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='653' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='minor' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='654' column='1'/>
+          <var-decl name='minor' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='654' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
@@ -5445,8 +5438,8 @@
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Tag' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='662' column='1' id='type-id-259'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-241'/>
+      <class-decl name='Tag' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='662' column='1' id='type-id-257'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-239'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
         </data-member>
@@ -5454,8 +5447,8 @@
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Offset&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-301'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-241'/>
+      <class-decl name='Offset&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-299'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-239'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
@@ -5463,8 +5456,8 @@
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='CheckSum' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='692' column='1' id='type-id-231'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-241'/>
+      <class-decl name='CheckSum' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='692' column='1' id='type-id-229'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-239'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
         </data-member>
@@ -5472,12 +5465,12 @@
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='FixedVersion' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='718' column='1' id='type-id-233'>
+      <class-decl name='FixedVersion' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='718' column='1' id='type-id-231'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='major' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='726' column='1'/>
+          <var-decl name='major' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='726' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='minor' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='727' column='1'/>
+          <var-decl name='minor' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='727' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
@@ -5487,20 +5480,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12FixedVersion8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='721' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-234' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-232' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='to_int' mangled-name='_ZNK2OT12FixedVersion6to_intEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='719' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-286' is-artificial='yes'/>
+            <parameter type-id='type-id-284' is-artificial='yes'/>
             <return type-id='type-id-100'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-188'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+      <class-decl name='OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-186'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5509,114 +5502,114 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-249' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-247' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-249' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-247' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-309' is-artificial='yes'/>
+            <parameter type-id='type-id-307' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-305'/>
+            <return type-id='type-id-303'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-221'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-219'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-189' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-222' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-220' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-222' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-220' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-270' is-artificial='yes'/>
+            <parameter type-id='type-id-268' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-308'/>
+            <return type-id='type-id-306'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='head' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='45' column='1' id='type-id-265'>
+      <class-decl name='head' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='45' column='1' id='type-id-263'>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='46' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='46' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='60' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='fontRevision' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='62' column='1'/>
+          <var-decl name='fontRevision' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='checkSumAdjustment' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='63' column='1'/>
+          <var-decl name='checkSumAdjustment' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='63' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='magicNumber' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='66' column='1'/>
+          <var-decl name='magicNumber' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='flags' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='67' column='1'/>
+          <var-decl name='flags' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='67' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='144'>
-          <var-decl name='unitsPerEm' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='113' column='1'/>
+          <var-decl name='unitsPerEm' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='113' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='160'>
-          <var-decl name='created' type-id='type-id-243' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='116' column='1'/>
+          <var-decl name='created' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='116' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='224'>
-          <var-decl name='modified' type-id='type-id-243' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='118' column='1'/>
+          <var-decl name='modified' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='118' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='288'>
-          <var-decl name='xMin' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='120' column='1'/>
+          <var-decl name='xMin' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='120' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='304'>
-          <var-decl name='yMin' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='121' column='1'/>
+          <var-decl name='yMin' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='320'>
-          <var-decl name='xMax' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='122' column='1'/>
+          <var-decl name='xMax' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='122' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='336'>
-          <var-decl name='yMax' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='123' column='1'/>
+          <var-decl name='yMax' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='123' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='352'>
-          <var-decl name='macStyle' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='124' column='1'/>
+          <var-decl name='macStyle' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='124' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='368'>
-          <var-decl name='lowestRecPPEM' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='132' column='1'/>
+          <var-decl name='lowestRecPPEM' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='132' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='384'>
-          <var-decl name='fontDirectionHint' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='133' column='1'/>
+          <var-decl name='fontDirectionHint' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='133' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='400'>
-          <var-decl name='indexToLocFormat' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='139' column='1'/>
+          <var-decl name='indexToLocFormat' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='139' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='416'>
-          <var-decl name='glyphDataFormat' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='140' column='1'/>
+          <var-decl name='glyphDataFormat' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='140' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
@@ -5626,27 +5619,27 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4head8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-266' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-264' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_upem' mangled-name='_ZNK2OT4head8get_upemEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-330' is-artificial='yes'/>
+            <parameter type-id='type-id-328' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='maxp' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='43' column='1' id='type-id-267'>
+      <class-decl name='maxp' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='43' column='1' id='type-id-265'>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='44' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='44' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='58' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='58' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='numGlyphs' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='60' column='1'/>
+          <var-decl name='numGlyphs' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
@@ -5656,35 +5649,35 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_num_glyphs' mangled-name='_ZNK2OT4maxp14get_num_glyphsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-332' is-artificial='yes'/>
+            <parameter type-id='type-id-330' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4maxp8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-268' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-266' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-252'/>
-      <typedef-decl name='OpenTypeFontFace' type-id='type-id-245' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='119' column='1' id='type-id-310'/>
-      <typedef-decl name='USHORT' type-id='type-id-239' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='632' column='1' id='type-id-373'/>
-      <typedef-decl name='SHORT' type-id='type-id-237' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='633' column='1' id='type-id-575'/>
-      <typedef-decl name='ULONG' type-id='type-id-241' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='634' column='1' id='type-id-324'/>
-      <typedef-decl name='LONG' type-id='type-id-235' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='635' column='1' id='type-id-574'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-250'/>
+      <typedef-decl name='OpenTypeFontFace' type-id='type-id-243' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='119' column='1' id='type-id-308'/>
+      <typedef-decl name='USHORT' type-id='type-id-237' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='632' column='1' id='type-id-371'/>
+      <typedef-decl name='SHORT' type-id='type-id-235' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='633' column='1' id='type-id-573'/>
+      <typedef-decl name='ULONG' type-id='type-id-239' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='634' column='1' id='type-id-322'/>
+      <typedef-decl name='LONG' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='635' column='1' id='type-id-572'/>
     </namespace-decl>
-    <typedef-decl name='hb_shape_plan_t' type-id='type-id-217' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.h' line='39' column='1' id='type-id-352'/>
-    <typedef-decl name='hb_feature_t' type-id='type-id-220' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='48' column='1' id='type-id-334'/>
-    <typedef-decl name='hb_shape_func_t' type-id='type-id-576' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-351'/>
-    <function-type size-in-bits='64' id='type-id-346'>
-      <parameter type-id='type-id-162'/>
-      <parameter type-id='type-id-187'/>
+    <typedef-decl name='hb_shape_plan_t' type-id='type-id-215' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.h' line='39' column='1' id='type-id-350'/>
+    <typedef-decl name='hb_feature_t' type-id='type-id-218' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='48' column='1' id='type-id-332'/>
+    <typedef-decl name='hb_shape_func_t' type-id='type-id-574' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-349'/>
+    <function-type size-in-bits='64' id='type-id-344'>
+      <parameter type-id='type-id-160'/>
+      <parameter type-id='type-id-185'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-57'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-353'>
+    <function-type size-in-bits='64' id='type-id-351'>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-15'/>
@@ -5693,7 +5686,7 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-35'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-355'>
+    <function-type size-in-bits='64' id='type-id-353'>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-64'/>
@@ -5702,24 +5695,24 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-35'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-357'>
+    <function-type size-in-bits='64' id='type-id-355'>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-35'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-359'>
+    <function-type size-in-bits='64' id='type-id-357'>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-165'/>
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-35'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-361'>
+    <function-type size-in-bits='64' id='type-id-359'>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-64'/>
@@ -5728,58 +5721,58 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-35'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-363'>
+    <function-type size-in-bits='64' id='type-id-361'>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-165'/>
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-17'/>
-      <return type-id='type-id-35'/>
+      <return type-id='type-id-103'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-576'>
-      <parameter type-id='type-id-195'/>
+    <function-type size-in-bits='64' id='type-id-363'>
       <parameter type-id='type-id-147'/>
-      <parameter type-id='type-id-145'/>
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-12'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-17'/>
       <return type-id='type-id-35'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-365'>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-103'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-367'>
+    <function-type size-in-bits='64' id='type-id-574'>
+      <parameter type-id='type-id-193'/>
       <parameter type-id='type-id-147'/>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-17'/>
-      <return type-id='type-id-103'/>
+      <parameter type-id='type-id-145'/>
+      <parameter type-id='type-id-334'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-35'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-577'/>
+    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-575'/>
     <function-decl name='hb_font_funcs_create' mangled-name='hb_font_funcs_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_create'>
-      <return type-id='type-id-163'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <function-decl name='hb_font_funcs_get_empty' mangled-name='hb_font_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_empty'>
-      <return type-id='type-id-163'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <function-decl name='hb_font_funcs_reference' mangled-name='hb_font_funcs_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_reference'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1'/>
-      <return type-id='type-id-163'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <function-decl name='hb_font_funcs_destroy' mangled-name='hb_font_funcs_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_destroy'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='294' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='294' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_user_data' mangled-name='hb_font_funcs_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_user_data'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1'/>
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='322' column='1'/>
       <parameter type-id='type-id-17' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='323' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='324' column='1'/>
@@ -5787,91 +5780,91 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_funcs_get_user_data' mangled-name='hb_font_funcs_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_user_data'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1'/>
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='343' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='hb_font_funcs_make_immutable' mangled-name='hb_font_funcs_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_make_immutable'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_is_immutable' mangled-name='hb_font_funcs_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_is_immutable'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_contour_point_func' mangled-name='hb_font_funcs_set_glyph_contour_point_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_contour_point_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-209' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-207' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_extents_func' mangled-name='hb_font_funcs_set_glyph_extents_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_extents_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-208' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-206' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_from_name_func' mangled-name='hb_font_funcs_set_glyph_from_name_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_from_name_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-211' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-209' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_func' mangled-name='hb_font_funcs_set_glyph_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-201' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-199' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_h_advance_func' mangled-name='hb_font_funcs_set_glyph_h_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_advance_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-202' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-200' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_h_kerning_func' mangled-name='hb_font_funcs_set_glyph_h_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_kerning_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-206' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-204' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_h_origin_func' mangled-name='hb_font_funcs_set_glyph_h_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_origin_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-204' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-202' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_name_func' mangled-name='hb_font_funcs_set_glyph_name_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_name_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-210' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-208' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_v_advance_func' mangled-name='hb_font_funcs_set_glyph_v_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_advance_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-203' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-201' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_v_kerning_func' mangled-name='hb_font_funcs_set_glyph_v_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_kerning_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-207' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-205' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_v_origin_func' mangled-name='hb_font_funcs_set_glyph_v_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_origin_func'>
-      <parameter type-id='type-id-163' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
-      <parameter type-id='type-id-205' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-161' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-203' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-17' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-23'/>
@@ -5896,15 +5889,15 @@
     <function-decl name='hb_font_get_glyph_h_origin' mangled-name='hb_font_get_glyph_h_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_origin'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_v_origin' mangled-name='hb_font_get_glyph_v_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_origin'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='510' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_h_kerning' mangled-name='hb_font_get_glyph_h_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_kerning'>
@@ -5922,15 +5915,15 @@
     <function-decl name='hb_font_get_glyph_extents' mangled-name='hb_font_get_glyph_extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
-      <parameter type-id='type-id-166' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
+      <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_contour_point' mangled-name='hb_font_get_glyph_contour_point' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <parameter type-id='type-id-12' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_name' mangled-name='hb_font_get_glyph_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_name'>
@@ -5951,32 +5944,32 @@
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_origin_for_direction' mangled-name='hb_font_get_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_origin_for_direction'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='676' column='1'/>
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='677' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_add_glyph_origin_for_direction' mangled-name='hb_font_add_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_add_glyph_origin_for_direction'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='697' column='1'/>
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='698' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_subtract_glyph_origin_for_direction' mangled-name='hb_font_subtract_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_subtract_glyph_origin_for_direction'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='718' column='1'/>
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='719' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_kerning_for_direction' mangled-name='hb_font_get_glyph_kerning_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_kerning_for_direction'>
@@ -5984,15 +5977,15 @@
       <parameter type-id='type-id-64' name='first_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
       <parameter type-id='type-id-64' name='second_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='741' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_extents_for_origin' mangled-name='hb_font_get_glyph_extents_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents_for_origin'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='762' column='1'/>
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='763' column='1'/>
-      <parameter type-id='type-id-166' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
+      <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_contour_point_for_origin' mangled-name='hb_font_get_glyph_contour_point_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point_for_origin'>
@@ -6000,8 +5993,8 @@
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <parameter type-id='type-id-12' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <parameter type-id='type-id-105' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='787' column='1'/>
-      <parameter type-id='type-id-165' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
-      <parameter type-id='type-id-165' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_glyph_to_string' mangled-name='hb_font_glyph_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_to_string'>
@@ -6019,7 +6012,7 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_font_create' mangled-name='hb_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
       <return type-id='type-id-147'/>
     </function-decl>
     <function-decl name='hb_font_create_sub_font' mangled-name='hb_font_create_sub_font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create_sub_font'>
@@ -6064,11 +6057,11 @@
     </function-decl>
     <function-decl name='hb_font_get_face' mangled-name='hb_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_face'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_font_set_funcs' mangled-name='hb_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
-      <parameter type-id='type-id-163' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
+      <parameter type-id='type-id-161' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
       <parameter type-id='type-id-17' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1106' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1107' column='1'/>
       <return type-id='type-id-23'/>
@@ -6087,8 +6080,8 @@
     </function-decl>
     <function-decl name='hb_font_get_scale' mangled-name='hb_font_get_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_scale'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
-      <parameter type-id='type-id-577' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
-      <parameter type-id='type-id-577' name='y_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1193' column='1'/>
+      <parameter type-id='type-id-575' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
+      <parameter type-id='type-id-575' name='y_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1193' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_font_set_ppem' mangled-name='hb_font_set_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_ppem'>
@@ -6105,50 +6098,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <class-decl name='FT_Glyph_Metrics_' size-in-bits='512' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='280' column='1' id='type-id-578'>
+    <class-decl name='FT_Glyph_Metrics_' size-in-bits='512' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='280' column='1' id='type-id-576'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='width' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='281' column='1'/>
+        <var-decl name='width' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='281' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='282' column='1'/>
+        <var-decl name='height' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='282' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='horiBearingX' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='284' column='1'/>
+        <var-decl name='horiBearingX' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='284' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='horiBearingY' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='285' column='1'/>
+        <var-decl name='horiBearingY' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='285' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='horiAdvance' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='286' column='1'/>
+        <var-decl name='horiAdvance' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='286' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='vertBearingX' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='288' column='1'/>
+        <var-decl name='vertBearingX' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='288' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='vertBearingY' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='289' column='1'/>
+        <var-decl name='vertBearingY' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='289' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='vertAdvance' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='290' column='1'/>
+        <var-decl name='vertAdvance' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='290' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_Bitmap_Size_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='334' column='1' id='type-id-580'>
+    <class-decl name='FT_Bitmap_Size_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='334' column='1' id='type-id-578'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='height' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='335' column='1'/>
+        <var-decl name='height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='335' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='width' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='336' column='1'/>
+        <var-decl name='width' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='336' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='size' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='338' column='1'/>
+        <var-decl name='size' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='x_ppem' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='340' column='1'/>
+        <var-decl name='x_ppem' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='340' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='y_ppem' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='341' column='1'/>
+        <var-decl name='y_ppem' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='341' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='FT_Encoding_' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='698' column='1' id='type-id-582'>
+    <enum-decl name='FT_Encoding_' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='698' column='1' id='type-id-580'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='FT_ENCODING_NONE' value='0'/>
       <enumerator name='FT_ENCODING_MS_SYMBOL' value='1937337698'/>
@@ -6170,203 +6163,203 @@
       <enumerator name='FT_ENCODING_OLD_LATIN_2' value='1818326066'/>
       <enumerator name='FT_ENCODING_APPLE_ROMAN' value='1634889070'/>
     </enum-decl>
-    <class-decl name='FT_CharMapRec_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='780' column='1' id='type-id-583'>
+    <class-decl name='FT_CharMapRec_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='780' column='1' id='type-id-581'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='face' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='781' column='1'/>
+        <var-decl name='face' type-id='type-id-582' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='781' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='encoding' type-id='type-id-585' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='782' column='1'/>
+        <var-decl name='encoding' type-id='type-id-583' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='782' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='platform_id' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='783' column='1'/>
+        <var-decl name='platform_id' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='783' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='encoding_id' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='784' column='1'/>
+        <var-decl name='encoding_id' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='784' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_FaceRec_' size-in-bits='1984' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='959' column='1' id='type-id-587'>
+    <class-decl name='FT_FaceRec_' size-in-bits='1984' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='959' column='1' id='type-id-585'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='num_faces' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='960' column='1'/>
+        <var-decl name='num_faces' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='960' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='face_index' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='961' column='1'/>
+        <var-decl name='face_index' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='961' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='face_flags' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='963' column='1'/>
+        <var-decl name='face_flags' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='963' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='style_flags' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='964' column='1'/>
+        <var-decl name='style_flags' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='964' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='num_glyphs' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='966' column='1'/>
+        <var-decl name='num_glyphs' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='966' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='family_name' type-id='type-id-589' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='968' column='1'/>
+        <var-decl name='family_name' type-id='type-id-587' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='968' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='style_name' type-id='type-id-589' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='969' column='1'/>
+        <var-decl name='style_name' type-id='type-id-587' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='969' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='num_fixed_sizes' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='971' column='1'/>
+        <var-decl name='num_fixed_sizes' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='971' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='available_sizes' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='972' column='1'/>
+        <var-decl name='available_sizes' type-id='type-id-589' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='972' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='num_charmaps' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='974' column='1'/>
+        <var-decl name='num_charmaps' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='charmaps' type-id='type-id-592' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='975' column='1'/>
+        <var-decl name='charmaps' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='975' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='generic' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='977' column='1'/>
+        <var-decl name='generic' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='977' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='bbox' type-id='type-id-594' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='982' column='1'/>
+        <var-decl name='bbox' type-id='type-id-592' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='982' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='units_per_EM' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='984' column='1'/>
+        <var-decl name='units_per_EM' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='984' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1104'>
-        <var-decl name='ascender' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='985' column='1'/>
+        <var-decl name='ascender' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='985' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='descender' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='986' column='1'/>
+        <var-decl name='descender' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='986' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1136'>
-        <var-decl name='height' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='987' column='1'/>
+        <var-decl name='height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='987' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='max_advance_width' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='989' column='1'/>
+        <var-decl name='max_advance_width' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='989' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1168'>
-        <var-decl name='max_advance_height' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='990' column='1'/>
+        <var-decl name='max_advance_height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='990' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='underline_position' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='992' column='1'/>
+        <var-decl name='underline_position' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='992' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1200'>
-        <var-decl name='underline_thickness' type-id='type-id-581' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='993' column='1'/>
+        <var-decl name='underline_thickness' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='993' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='glyph' type-id='type-id-595' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='995' column='1'/>
+        <var-decl name='glyph' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='995' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='size' type-id='type-id-596' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='996' column='1'/>
+        <var-decl name='size' type-id='type-id-594' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='996' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='charmap' type-id='type-id-597' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='997' column='1'/>
+        <var-decl name='charmap' type-id='type-id-595' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='997' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='driver' type-id='type-id-598' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1001' column='1'/>
+        <var-decl name='driver' type-id='type-id-596' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1001' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='memory' type-id='type-id-599' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1002' column='1'/>
+        <var-decl name='memory' type-id='type-id-597' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1002' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='stream' type-id='type-id-600' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1003' column='1'/>
+        <var-decl name='stream' type-id='type-id-598' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1003' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='sizes_list' type-id='type-id-601' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1005' column='1'/>
+        <var-decl name='sizes_list' type-id='type-id-599' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1005' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='autohint' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1007' column='1'/>
+        <var-decl name='autohint' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1007' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
         <var-decl name='extensions' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1008' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='internal' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1010' column='1'/>
+        <var-decl name='internal' type-id='type-id-600' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1010' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_Size_Metrics_' size-in-bits='448' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1426' column='1' id='type-id-603'>
+    <class-decl name='FT_Size_Metrics_' size-in-bits='448' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1426' column='1' id='type-id-601'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x_ppem' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1427' column='1'/>
+        <var-decl name='x_ppem' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1427' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='y_ppem' type-id='type-id-586' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1428' column='1'/>
+        <var-decl name='y_ppem' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='x_scale' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1430' column='1'/>
+        <var-decl name='x_scale' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1430' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='y_scale' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1431' column='1'/>
+        <var-decl name='y_scale' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ascender' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1433' column='1'/>
+        <var-decl name='ascender' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='descender' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1434' column='1'/>
+        <var-decl name='descender' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1434' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='height' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1435' column='1'/>
+        <var-decl name='height' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1435' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='max_advance' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1436' column='1'/>
+        <var-decl name='max_advance' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1436' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_SizeRec_' size-in-bits='704' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1461' column='1' id='type-id-605'>
+    <class-decl name='FT_SizeRec_' size-in-bits='704' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1461' column='1' id='type-id-603'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='face' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1462' column='1'/>
+        <var-decl name='face' type-id='type-id-582' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='generic' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1463' column='1'/>
+        <var-decl name='generic' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1463' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='metrics' type-id='type-id-606' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1464' column='1'/>
+        <var-decl name='metrics' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='internal' type-id='type-id-607' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1465' column='1'/>
+        <var-decl name='internal' type-id='type-id-605' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1465' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_GlyphSlotRec_' size-in-bits='2432' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1671' column='1' id='type-id-608'>
+    <class-decl name='FT_GlyphSlotRec_' size-in-bits='2432' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1671' column='1' id='type-id-606'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='library' type-id='type-id-609' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1672' column='1'/>
+        <var-decl name='library' type-id='type-id-607' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1672' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='face' type-id='type-id-584' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1673' column='1'/>
+        <var-decl name='face' type-id='type-id-582' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1673' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next' type-id='type-id-595' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1674' column='1'/>
+        <var-decl name='next' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1674' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='reserved' type-id='type-id-610' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1675' column='1'/>
+        <var-decl name='reserved' type-id='type-id-608' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1675' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='generic' type-id='type-id-593' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1676' column='1'/>
+        <var-decl name='generic' type-id='type-id-591' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1676' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='metrics' type-id='type-id-611' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1678' column='1'/>
+        <var-decl name='metrics' type-id='type-id-609' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1678' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='linearHoriAdvance' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1679' column='1'/>
+        <var-decl name='linearHoriAdvance' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1679' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='linearVertAdvance' type-id='type-id-604' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1680' column='1'/>
+        <var-decl name='linearVertAdvance' type-id='type-id-602' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1680' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='advance' type-id='type-id-612' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1681' column='1'/>
+        <var-decl name='advance' type-id='type-id-610' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1681' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='format' type-id='type-id-613' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1683' column='1'/>
+        <var-decl name='format' type-id='type-id-611' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1683' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='bitmap' type-id='type-id-614' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1685' column='1'/>
+        <var-decl name='bitmap' type-id='type-id-612' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1685' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='bitmap_left' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1686' column='1'/>
+        <var-decl name='bitmap_left' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1686' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='bitmap_top' type-id='type-id-590' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1687' column='1'/>
+        <var-decl name='bitmap_top' type-id='type-id-588' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1687' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='outline' type-id='type-id-615' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1689' column='1'/>
+        <var-decl name='outline' type-id='type-id-613' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1689' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='num_subglyphs' type-id='type-id-610' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1691' column='1'/>
+        <var-decl name='num_subglyphs' type-id='type-id-608' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1691' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1984'>
-        <var-decl name='subglyphs' type-id='type-id-616' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1692' column='1'/>
+        <var-decl name='subglyphs' type-id='type-id-614' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1692' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
         <var-decl name='control_data' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1694' column='1'/>
@@ -6375,41 +6368,41 @@
         <var-decl name='control_len' type-id='type-id-10' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1695' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='lsb_delta' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1697' column='1'/>
+        <var-decl name='lsb_delta' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1697' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='rsb_delta' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1698' column='1'/>
+        <var-decl name='rsb_delta' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1698' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <var-decl name='other' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1700' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='internal' type-id='type-id-617' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1702' column='1'/>
+        <var-decl name='internal' type-id='type-id-615' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1702' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_Vector_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='75' column='1' id='type-id-618'>
+    <class-decl name='FT_Vector_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='75' column='1' id='type-id-616'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='76' column='1'/>
+        <var-decl name='x' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='y' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='77' column='1'/>
+        <var-decl name='y' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='77' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_BBox_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='116' column='1' id='type-id-619'>
+    <class-decl name='FT_BBox_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='116' column='1' id='type-id-617'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='xMin' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='117' column='1'/>
+        <var-decl name='xMin' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='yMin' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='117' column='1'/>
+        <var-decl name='yMin' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='xMax' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='118' column='1'/>
+        <var-decl name='xMax' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='yMax' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='118' column='1'/>
+        <var-decl name='yMax' type-id='type-id-577' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='118' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_Bitmap_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='320' column='1' id='type-id-620'>
+    <class-decl name='FT_Bitmap_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='320' column='1' id='type-id-618'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='rows' type-id='type-id-9' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='321' column='1'/>
       </data-member>
@@ -6420,7 +6413,7 @@
         <var-decl name='pitch' type-id='type-id-9' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='buffer' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='324' column='1'/>
+        <var-decl name='buffer' type-id='type-id-619' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='num_grays' type-id='type-id-72' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='325' column='1'/>
@@ -6435,7 +6428,7 @@
         <var-decl name='palette' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='328' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_Outline_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='393' column='1' id='type-id-622'>
+    <class-decl name='FT_Outline_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='393' column='1' id='type-id-620'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='n_contours' type-id='type-id-72' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='394' column='1'/>
       </data-member>
@@ -6443,19 +6436,19 @@
         <var-decl name='n_points' type-id='type-id-72' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='points' type-id='type-id-623' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='397' column='1'/>
+        <var-decl name='points' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='397' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='tags' type-id='type-id-45' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='contours' type-id='type-id-624' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='399' column='1'/>
+        <var-decl name='contours' type-id='type-id-622' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='flags' type-id='type-id-9' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='401' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='FT_Glyph_Format_' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='787' column='1' id='type-id-625'>
+    <enum-decl name='FT_Glyph_Format_' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='787' column='1' id='type-id-623'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='FT_GLYPH_FORMAT_NONE' value='0'/>
       <enumerator name='FT_GLYPH_FORMAT_COMPOSITE' value='1668246896'/>
@@ -6463,21 +6456,21 @@
       <enumerator name='FT_GLYPH_FORMAT_OUTLINE' value='1869968492'/>
       <enumerator name='FT_GLYPH_FORMAT_PLOTTER' value='1886154612'/>
     </enum-decl>
-    <class-decl name='FT_MemoryRec_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='172' column='1' id='type-id-626'>
+    <class-decl name='FT_MemoryRec_' size-in-bits='256' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='172' column='1' id='type-id-624'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='user' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='alloc' type-id='type-id-627' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='174' column='1'/>
+        <var-decl name='alloc' type-id='type-id-625' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='free' type-id='type-id-628' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='175' column='1'/>
+        <var-decl name='free' type-id='type-id-626' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='175' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='realloc' type-id='type-id-629' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='176' column='1'/>
+        <var-decl name='realloc' type-id='type-id-627' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='176' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='FT_StreamDesc_' size-in-bits='64' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='210' column='1' id='type-id-630'>
+    <union-decl name='FT_StreamDesc_' size-in-bits='64' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='210' column='1' id='type-id-628'>
       <data-member access='public'>
         <var-decl name='value' type-id='type-id-10' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='211' column='1'/>
       </data-member>
@@ -6485,9 +6478,9 @@
         <var-decl name='pointer' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='212' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='FT_StreamRec_' size-in-bits='640' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='322' column='1' id='type-id-631'>
+    <class-decl name='FT_StreamRec_' size-in-bits='640' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='322' column='1' id='type-id-629'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='base' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='323' column='1'/>
+        <var-decl name='base' type-id='type-id-619' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='size' type-id='type-id-4' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='324' column='1'/>
@@ -6496,134 +6489,134 @@
         <var-decl name='pos' type-id='type-id-4' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='descriptor' type-id='type-id-632' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='327' column='1'/>
+        <var-decl name='descriptor' type-id='type-id-630' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='pathname' type-id='type-id-632' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='328' column='1'/>
+        <var-decl name='pathname' type-id='type-id-630' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='read' type-id='type-id-633' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='329' column='1'/>
+        <var-decl name='read' type-id='type-id-631' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='close' type-id='type-id-634' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='330' column='1'/>
+        <var-decl name='close' type-id='type-id-632' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='memory' type-id='type-id-599' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='332' column='1'/>
+        <var-decl name='memory' type-id='type-id-597' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='cursor' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='333' column='1'/>
+        <var-decl name='cursor' type-id='type-id-619' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='limit' type-id='type-id-621' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='334' column='1'/>
+        <var-decl name='limit' type-id='type-id-619' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='334' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_Generic_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='456' column='1' id='type-id-635'>
+    <class-decl name='FT_Generic_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='456' column='1' id='type-id-633'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='data' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='457' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='finalizer' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='458' column='1'/>
+        <var-decl name='finalizer' type-id='type-id-634' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='458' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_ListNodeRec_' size-in-bits='192' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='541' column='1' id='type-id-637'>
+    <class-decl name='FT_ListNodeRec_' size-in-bits='192' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='541' column='1' id='type-id-635'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='prev' type-id='type-id-638' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='542' column='1'/>
+        <var-decl name='prev' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='542' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-638' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='543' column='1'/>
+        <var-decl name='next' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='543' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='data' type-id='type-id-17' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='544' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='FT_ListRec_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='564' column='1' id='type-id-639'>
+    <class-decl name='FT_ListRec_' size-in-bits='128' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='564' column='1' id='type-id-637'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-638' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='565' column='1'/>
+        <var-decl name='head' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='565' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-638' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='566' column='1'/>
+        <var-decl name='tail' type-id='type-id-636' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='566' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-591'/>
-    <pointer-type-def type-id='type-id-597' size-in-bits='64' id='type-id-592'/>
-    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-641'/>
-    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-643'/>
-    <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-644'/>
-    <pointer-type-def type-id='type-id-645' size-in-bits='64' id='type-id-646'/>
-    <pointer-type-def type-id='type-id-608' size-in-bits='64' id='type-id-647'/>
-    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-649'/>
-    <pointer-type-def type-id='type-id-637' size-in-bits='64' id='type-id-650'/>
-    <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-651'/>
-    <pointer-type-def type-id='type-id-605' size-in-bits='64' id='type-id-652'/>
+    <pointer-type-def type-id='type-id-638' size-in-bits='64' id='type-id-589'/>
+    <pointer-type-def type-id='type-id-595' size-in-bits='64' id='type-id-590'/>
+    <pointer-type-def type-id='type-id-581' size-in-bits='64' id='type-id-639'/>
+    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-641'/>
+    <pointer-type-def type-id='type-id-585' size-in-bits='64' id='type-id-642'/>
+    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-644'/>
+    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-645'/>
+    <pointer-type-def type-id='type-id-646' size-in-bits='64' id='type-id-647'/>
+    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-648'/>
+    <pointer-type-def type-id='type-id-624' size-in-bits='64' id='type-id-649'/>
+    <pointer-type-def type-id='type-id-603' size-in-bits='64' id='type-id-650'/>
+    <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-652'/>
     <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-654'/>
-    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
-    <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-657'/>
-    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-589'/>
+    <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-655'/>
+    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-587'/>
+    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-658'/>
+    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-621'/>
+    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-622'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-619'/>
     <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-660'/>
-    <pointer-type-def type-id='type-id-612' size-in-bits='64' id='type-id-623'/>
-    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-624'/>
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-621'/>
     <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-662'/>
     <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-664'/>
     <pointer-type-def type-id='type-id-665' size-in-bits='64' id='type-id-666'/>
     <pointer-type-def type-id='type-id-667' size-in-bits='64' id='type-id-668'/>
-    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-670'/>
-    <class-decl name='FT_DriverRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-642'/>
-    <class-decl name='FT_Face_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-645'/>
-    <class-decl name='FT_LibraryRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-648'/>
-    <class-decl name='FT_Size_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-653'/>
-    <class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-655'/>
-    <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-659'/>
-    <typedef-decl name='FT_Glyph_Metrics' type-id='type-id-578' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='292' column='1' id='type-id-611'/>
-    <typedef-decl name='FT_Bitmap_Size' type-id='type-id-580' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='343' column='1' id='type-id-640'/>
-    <typedef-decl name='FT_Library' type-id='type-id-649' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='376' column='1' id='type-id-609'/>
-    <typedef-decl name='FT_Driver' type-id='type-id-643' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='401' column='1' id='type-id-598'/>
-    <typedef-decl name='FT_Face' type-id='type-id-644' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='440' column='1' id='type-id-584'/>
-    <typedef-decl name='FT_Size' type-id='type-id-652' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='471' column='1' id='type-id-596'/>
-    <typedef-decl name='FT_GlyphSlot' type-id='type-id-647' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='492' column='1' id='type-id-595'/>
-    <typedef-decl name='FT_CharMap' type-id='type-id-641' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='524' column='1' id='type-id-597'/>
-    <typedef-decl name='FT_Encoding' type-id='type-id-582' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='727' column='1' id='type-id-585'/>
-    <typedef-decl name='FT_Face_Internal' type-id='type-id-646' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='810' column='1' id='type-id-602'/>
-    <typedef-decl name='FT_Size_Internal' type-id='type-id-654' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1367' column='1' id='type-id-607'/>
-    <typedef-decl name='FT_Size_Metrics' type-id='type-id-603' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1438' column='1' id='type-id-606'/>
-    <typedef-decl name='FT_SubGlyph' type-id='type-id-660' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1486' column='1' id='type-id-616'/>
-    <typedef-decl name='FT_Slot_Internal' type-id='type-id-656' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1498' column='1' id='type-id-617'/>
-    <typedef-decl name='FT_Pos' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-579'/>
-    <typedef-decl name='FT_Vector' type-id='type-id-618' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='79' column='1' id='type-id-612'/>
-    <typedef-decl name='FT_BBox' type-id='type-id-619' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='120' column='1' id='type-id-594'/>
-    <typedef-decl name='FT_Bitmap' type-id='type-id-620' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='330' column='1' id='type-id-614'/>
-    <typedef-decl name='FT_Outline' type-id='type-id-622' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-615'/>
-    <typedef-decl name='FT_Glyph_Format' type-id='type-id-625' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='796' column='1' id='type-id-613'/>
-    <typedef-decl name='FT_Memory' type-id='type-id-651' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='66' column='1' id='type-id-599'/>
-    <typedef-decl name='FT_Alloc_Func' type-id='type-id-668' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='90' column='1' id='type-id-627'/>
-    <typedef-decl name='FT_Free_Func' type-id='type-id-664' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='111' column='1' id='type-id-628'/>
-    <typedef-decl name='FT_Realloc_Func' type-id='type-id-670' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='146' column='1' id='type-id-629'/>
-    <typedef-decl name='FT_Stream' type-id='type-id-657' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='196' column='1' id='type-id-600'/>
-    <typedef-decl name='FT_StreamDesc' type-id='type-id-630' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-632'/>
-    <typedef-decl name='FT_Stream_IoFunc' type-id='type-id-662' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='251' column='1' id='type-id-633'/>
-    <typedef-decl name='FT_Stream_CloseFunc' type-id='type-id-666' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='268' column='1' id='type-id-634'/>
-    <typedef-decl name='FT_String' type-id='type-id-2' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='183' column='1' id='type-id-658'/>
-    <typedef-decl name='FT_Short' type-id='type-id-72' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-581'/>
-    <typedef-decl name='FT_UShort' type-id='type-id-81' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='205' column='1' id='type-id-586'/>
-    <typedef-decl name='FT_Int' type-id='type-id-9' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='216' column='1' id='type-id-590'/>
-    <typedef-decl name='FT_UInt' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='227' column='1' id='type-id-610'/>
-    <typedef-decl name='FT_Long' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='238' column='1' id='type-id-588'/>
-    <typedef-decl name='FT_Fixed' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='284' column='1' id='type-id-604'/>
-    <typedef-decl name='FT_Generic_Finalizer' type-id='type-id-61' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='424' column='1' id='type-id-636'/>
-    <typedef-decl name='FT_Generic' type-id='type-id-635' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='460' column='1' id='type-id-593'/>
-    <typedef-decl name='FT_ListNode' type-id='type-id-650' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='511' column='1' id='type-id-638'/>
-    <typedef-decl name='FT_ListRec' type-id='type-id-639' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='568' column='1' id='type-id-601'/>
+    <class-decl name='FT_DriverRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-640'/>
+    <class-decl name='FT_Face_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-643'/>
+    <class-decl name='FT_LibraryRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-646'/>
+    <class-decl name='FT_Size_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-651'/>
+    <class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-653'/>
+    <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-657'/>
+    <typedef-decl name='FT_Glyph_Metrics' type-id='type-id-576' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='292' column='1' id='type-id-609'/>
+    <typedef-decl name='FT_Bitmap_Size' type-id='type-id-578' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='343' column='1' id='type-id-638'/>
+    <typedef-decl name='FT_Library' type-id='type-id-647' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='376' column='1' id='type-id-607'/>
+    <typedef-decl name='FT_Driver' type-id='type-id-641' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='401' column='1' id='type-id-596'/>
+    <typedef-decl name='FT_Face' type-id='type-id-642' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='440' column='1' id='type-id-582'/>
+    <typedef-decl name='FT_Size' type-id='type-id-650' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='471' column='1' id='type-id-594'/>
+    <typedef-decl name='FT_GlyphSlot' type-id='type-id-645' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='492' column='1' id='type-id-593'/>
+    <typedef-decl name='FT_CharMap' type-id='type-id-639' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='524' column='1' id='type-id-595'/>
+    <typedef-decl name='FT_Encoding' type-id='type-id-580' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='727' column='1' id='type-id-583'/>
+    <typedef-decl name='FT_Face_Internal' type-id='type-id-644' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='810' column='1' id='type-id-600'/>
+    <typedef-decl name='FT_Size_Internal' type-id='type-id-652' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1367' column='1' id='type-id-605'/>
+    <typedef-decl name='FT_Size_Metrics' type-id='type-id-601' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1438' column='1' id='type-id-604'/>
+    <typedef-decl name='FT_SubGlyph' type-id='type-id-658' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1486' column='1' id='type-id-614'/>
+    <typedef-decl name='FT_Slot_Internal' type-id='type-id-654' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='1498' column='1' id='type-id-615'/>
+    <typedef-decl name='FT_Pos' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-577'/>
+    <typedef-decl name='FT_Vector' type-id='type-id-616' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='79' column='1' id='type-id-610'/>
+    <typedef-decl name='FT_BBox' type-id='type-id-617' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='120' column='1' id='type-id-592'/>
+    <typedef-decl name='FT_Bitmap' type-id='type-id-618' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='330' column='1' id='type-id-612'/>
+    <typedef-decl name='FT_Outline' type-id='type-id-620' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-613'/>
+    <typedef-decl name='FT_Glyph_Format' type-id='type-id-623' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='796' column='1' id='type-id-611'/>
+    <typedef-decl name='FT_Memory' type-id='type-id-649' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='66' column='1' id='type-id-597'/>
+    <typedef-decl name='FT_Alloc_Func' type-id='type-id-666' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='90' column='1' id='type-id-625'/>
+    <typedef-decl name='FT_Free_Func' type-id='type-id-662' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='111' column='1' id='type-id-626'/>
+    <typedef-decl name='FT_Realloc_Func' type-id='type-id-668' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='146' column='1' id='type-id-627'/>
+    <typedef-decl name='FT_Stream' type-id='type-id-655' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='196' column='1' id='type-id-598'/>
+    <typedef-decl name='FT_StreamDesc' type-id='type-id-628' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-630'/>
+    <typedef-decl name='FT_Stream_IoFunc' type-id='type-id-660' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='251' column='1' id='type-id-631'/>
+    <typedef-decl name='FT_Stream_CloseFunc' type-id='type-id-664' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='268' column='1' id='type-id-632'/>
+    <typedef-decl name='FT_String' type-id='type-id-2' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='183' column='1' id='type-id-656'/>
+    <typedef-decl name='FT_Short' type-id='type-id-72' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-579'/>
+    <typedef-decl name='FT_UShort' type-id='type-id-81' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='205' column='1' id='type-id-584'/>
+    <typedef-decl name='FT_Int' type-id='type-id-9' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='216' column='1' id='type-id-588'/>
+    <typedef-decl name='FT_UInt' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='227' column='1' id='type-id-608'/>
+    <typedef-decl name='FT_Long' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='238' column='1' id='type-id-586'/>
+    <typedef-decl name='FT_Fixed' type-id='type-id-10' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='284' column='1' id='type-id-602'/>
+    <typedef-decl name='FT_Generic_Finalizer' type-id='type-id-61' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='424' column='1' id='type-id-634'/>
+    <typedef-decl name='FT_Generic' type-id='type-id-633' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='460' column='1' id='type-id-591'/>
+    <typedef-decl name='FT_ListNode' type-id='type-id-648' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='511' column='1' id='type-id-636'/>
+    <typedef-decl name='FT_ListRec' type-id='type-id-637' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='568' column='1' id='type-id-599'/>
     <function-decl name='hb_ft_face_create' mangled-name='hb_ft_face_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_face_create'>
-      <parameter type-id='type-id-584' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='333' column='1'/>
+      <parameter type-id='type-id-582' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='333' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='334' column='1'/>
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_ft_face_create_cached' mangled-name='hb_ft_face_create_cached' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_face_create_cached'>
-      <parameter type-id='type-id-584' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1'/>
-      <return type-id='type-id-162'/>
+      <parameter type-id='type-id-582' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_ft_font_create' mangled-name='hb_ft_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_create'>
-      <parameter type-id='type-id-584' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1'/>
+      <parameter type-id='type-id-582' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='409' column='1'/>
       <return type-id='type-id-147'/>
     </function-decl>
@@ -6633,31 +6626,31 @@
     </function-decl>
     <function-decl name='hb_ft_font_get_face' mangled-name='hb_ft_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_get_face'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
-      <return type-id='type-id-584'/>
+      <return type-id='type-id-582'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-661'>
-      <parameter type-id='type-id-600'/>
+    <function-type size-in-bits='64' id='type-id-659'>
+      <parameter type-id='type-id-598'/>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-621'/>
+      <parameter type-id='type-id-619'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-663'>
-      <parameter type-id='type-id-599'/>
+    <function-type size-in-bits='64' id='type-id-661'>
+      <parameter type-id='type-id-597'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-23'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-665'>
-      <parameter type-id='type-id-600'/>
+    <function-type size-in-bits='64' id='type-id-663'>
+      <parameter type-id='type-id-598'/>
       <return type-id='type-id-23'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-667'>
-      <parameter type-id='type-id-599'/>
+    <function-type size-in-bits='64' id='type-id-665'>
+      <parameter type-id='type-id-597'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-669'>
-      <parameter type-id='type-id-599'/>
+    <function-type size-in-bits='64' id='type-id-667'>
+      <parameter type-id='type-id-597'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-17'/>
@@ -6665,7 +6658,7 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <enum-decl name='GUnicodeScript' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/glib@2.42.1-46d6a76b/include/glib-2.0/glib/gunicode.h' line='409' column='1' id='type-id-671'>
+    <enum-decl name='GUnicodeScript' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/glib@2.42.1-46d6a76b/include/glib-2.0/glib/gunicode.h' line='409' column='1' id='type-id-669'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='G_UNICODE_SCRIPT_INVALID_CODE' value='-1'/>
       <enumerator name='G_UNICODE_SCRIPT_COMMON' value='0'/>
@@ -6796,52 +6789,52 @@
       <enumerator name='G_UNICODE_SCRIPT_WARANG_CITI' value='125'/>
     </enum-decl>
     <function-decl name='hb_glib_script_to_script' mangled-name='hb_glib_script_to_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_script_to_script'>
-      <parameter type-id='type-id-671' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1'/>
+      <parameter type-id='type-id-669' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1'/>
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='hb_glib_script_from_script' mangled-name='hb_glib_script_from_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_script_from_script'>
       <parameter type-id='type-id-106' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1'/>
-      <return type-id='type-id-671'/>
+      <return type-id='type-id-669'/>
     </function-decl>
     <function-decl name='hb_glib_get_unicode_funcs' mangled-name='hb_glib_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_get_unicode_funcs'>
       <return type-id='type-id-84'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-672' size-in-bits='2048' id='type-id-673'>
-      <subrange length='256' type-id='type-id-4' id='type-id-674'/>
+    <array-type-def dimensions='1' type-id='type-id-670' size-in-bits='2048' id='type-id-671'>
+      <subrange length='256' type-id='type-id-4' id='type-id-672'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-673' id='type-id-674'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-675' id='type-id-676'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-677' id='type-id-678'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-237' id='type-id-677'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-239' id='type-id-679'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-678' id='type-id-679'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-680' id='type-id-681'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-573' id='type-id-680'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-575' id='type-id-682'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-371' id='type-id-681'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-373' id='type-id-683'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-682' id='type-id-683'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-684' id='type-id-685'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-686' id='type-id-687'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-688' id='type-id-689'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='24' id='type-id-688'>
+      <subrange length='3' type-id='type-id-4' id='type-id-689'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='24' id='type-id-690'>
-      <subrange length='3' type-id='type-id-4' id='type-id-691'/>
-    </array-type-def>
-    <class-decl name='hb_ot_face_metrics_accelerator_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='39' column='1' id='type-id-692'>
+    <class-decl name='hb_ot_face_metrics_accelerator_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='39' column='1' id='type-id-690'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='num_metrics' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='40' column='1'/>
       </data-member>
@@ -6852,48 +6845,48 @@
         <var-decl name='default_advance' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='table' type-id='type-id-693' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='43' column='1'/>
+        <var-decl name='table' type-id='type-id-691' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='blob' type-id='type-id-57' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='44' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='get_advance' mangled-name='_ZNK32hb_ot_face_metrics_accelerator_t11get_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-694' is-artificial='yes'/>
+          <parameter type-id='type-id-692' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='fini' mangled-name='_ZN32hb_ot_face_metrics_accelerator_t4finiEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-695' is-artificial='yes'/>
+          <parameter type-id='type-id-693' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN32hb_ot_face_metrics_accelerator_t4initEP9hb_face_tjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-695' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-187'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-693' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
+          <parameter type-id='type-id-185'/>
+          <parameter type-id='type-id-185'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-696'>
+    <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-694'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='table' type-id='type-id-697' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='96' column='1'/>
+        <var-decl name='table' type-id='type-id-695' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='uvs_table' type-id='type-id-697' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='97' column='1'/>
+        <var-decl name='uvs_table' type-id='type-id-695' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='blob' type-id='type-id-57' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='98' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='get_glyph' mangled-name='_ZNK29hb_ot_face_cmap_accelerator_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-698' is-artificial='yes'/>
+          <parameter type-id='type-id-696' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-127'/>
@@ -6902,44 +6895,45 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN29hb_ot_face_cmap_accelerator_t4initEP9hb_face_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-699' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-697' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='fini' mangled-name='_ZN29hb_ot_face_cmap_accelerator_t4finiEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-699' is-artificial='yes'/>
+          <parameter type-id='type-id-697' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
+    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-699'/>
     <pointer-type-def type-id='type-id-700' size-in-bits='64' id='type-id-701'/>
-    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-703'/>
-    <pointer-type-def type-id='type-id-704' size-in-bits='64' id='type-id-560'/>
+    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-558'/>
+    <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-704'/>
     <pointer-type-def type-id='type-id-705' size-in-bits='64' id='type-id-706'/>
     <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-708'/>
     <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-710'/>
     <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
-    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
-    <reference-type-def kind='lvalue' type-id='type-id-715' size-in-bits='64' id='type-id-716'/>
-    <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-717'/>
+    <reference-type-def kind='lvalue' type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-715'/>
+    <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-717'/>
     <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-719'/>
     <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-721'/>
-    <pointer-type-def type-id='type-id-722' size-in-bits='64' id='type-id-723'/>
-    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-724'/>
-    <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-725'/>
+    <reference-type-def kind='lvalue' type-id='type-id-673' size-in-bits='64' id='type-id-722'/>
+    <pointer-type-def type-id='type-id-673' size-in-bits='64' id='type-id-723'/>
+    <pointer-type-def type-id='type-id-724' size-in-bits='64' id='type-id-725'/>
     <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-727'/>
     <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
     <pointer-type-def type-id='type-id-730' size-in-bits='64' id='type-id-731'/>
-    <pointer-type-def type-id='type-id-732' size-in-bits='64' id='type-id-733'/>
-    <reference-type-def kind='lvalue' type-id='type-id-677' size-in-bits='64' id='type-id-734'/>
-    <pointer-type-def type-id='type-id-677' size-in-bits='64' id='type-id-735'/>
-    <reference-type-def kind='lvalue' type-id='type-id-239' size-in-bits='64' id='type-id-736'/>
-    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-738'/>
-    <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-380'/>
-    <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-379'/>
-    <pointer-type-def type-id='type-id-741' size-in-bits='64' id='type-id-378'/>
+    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-732'/>
+    <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-733'/>
+    <reference-type-def kind='lvalue' type-id='type-id-237' size-in-bits='64' id='type-id-734'/>
+    <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-736'/>
+    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-378'/>
+    <pointer-type-def type-id='type-id-738' size-in-bits='64' id='type-id-377'/>
+    <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-376'/>
+    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-741'/>
     <reference-type-def kind='lvalue' type-id='type-id-742' size-in-bits='64' id='type-id-743'/>
     <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-745'/>
     <reference-type-def kind='lvalue' type-id='type-id-746' size-in-bits='64' id='type-id-747'/>
@@ -6947,111 +6941,110 @@
     <reference-type-def kind='lvalue' type-id='type-id-750' size-in-bits='64' id='type-id-751'/>
     <reference-type-def kind='lvalue' type-id='type-id-752' size-in-bits='64' id='type-id-753'/>
     <reference-type-def kind='lvalue' type-id='type-id-754' size-in-bits='64' id='type-id-755'/>
-    <reference-type-def kind='lvalue' type-id='type-id-756' size-in-bits='64' id='type-id-757'/>
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-384'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-382'/>
+    <reference-type-def kind='lvalue' type-id='type-id-682' size-in-bits='64' id='type-id-756'/>
+    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-757'/>
     <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-758'/>
     <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-759'/>
     <reference-type-def kind='lvalue' type-id='type-id-686' size-in-bits='64' id='type-id-760'/>
     <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-761'/>
-    <reference-type-def kind='lvalue' type-id='type-id-688' size-in-bits='64' id='type-id-762'/>
-    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-763'/>
+    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-763'/>
     <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-765'/>
     <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-767'/>
-    <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-769'/>
-    <qualified-type-def type-id='type-id-700' const='yes' id='type-id-770'/>
-    <pointer-type-def type-id='type-id-770' size-in-bits='64' id='type-id-390'/>
-    <qualified-type-def type-id='type-id-702' const='yes' id='type-id-771'/>
-    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-381'/>
-    <qualified-type-def type-id='type-id-704' const='yes' id='type-id-772'/>
-    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-386'/>
-    <qualified-type-def type-id='type-id-705' const='yes' id='type-id-773'/>
-    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-388'/>
-    <qualified-type-def type-id='type-id-707' const='yes' id='type-id-774'/>
-    <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-396'/>
-    <qualified-type-def type-id='type-id-709' const='yes' id='type-id-775'/>
-    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-394'/>
-    <qualified-type-def type-id='type-id-711' const='yes' id='type-id-776'/>
-    <pointer-type-def type-id='type-id-776' size-in-bits='64' id='type-id-393'/>
-    <qualified-type-def type-id='type-id-713' const='yes' id='type-id-777'/>
-    <reference-type-def kind='lvalue' type-id='type-id-777' size-in-bits='64' id='type-id-778'/>
-    <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-779'/>
-    <qualified-type-def type-id='type-id-715' const='yes' id='type-id-780'/>
-    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-781'/>
-    <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-697'/>
-    <qualified-type-def type-id='type-id-718' const='yes' id='type-id-782'/>
-    <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-382'/>
-    <qualified-type-def type-id='type-id-720' const='yes' id='type-id-783'/>
-    <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-399'/>
-    <qualified-type-def type-id='type-id-722' const='yes' id='type-id-784'/>
-    <pointer-type-def type-id='type-id-784' size-in-bits='64' id='type-id-383'/>
-    <qualified-type-def type-id='type-id-675' const='yes' id='type-id-785'/>
-    <reference-type-def kind='lvalue' type-id='type-id-785' size-in-bits='64' id='type-id-786'/>
-    <pointer-type-def type-id='type-id-785' size-in-bits='64' id='type-id-787'/>
-    <qualified-type-def type-id='type-id-726' const='yes' id='type-id-788'/>
-    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-391'/>
-    <qualified-type-def type-id='type-id-728' const='yes' id='type-id-789'/>
-    <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-392'/>
-    <qualified-type-def type-id='type-id-730' const='yes' id='type-id-790'/>
-    <pointer-type-def type-id='type-id-790' size-in-bits='64' id='type-id-387'/>
-    <qualified-type-def type-id='type-id-732' const='yes' id='type-id-791'/>
-    <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-389'/>
-    <qualified-type-def type-id='type-id-677' const='yes' id='type-id-792'/>
+    <qualified-type-def type-id='type-id-698' const='yes' id='type-id-768'/>
+    <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-388'/>
+    <qualified-type-def type-id='type-id-700' const='yes' id='type-id-769'/>
+    <pointer-type-def type-id='type-id-769' size-in-bits='64' id='type-id-379'/>
+    <qualified-type-def type-id='type-id-702' const='yes' id='type-id-770'/>
+    <pointer-type-def type-id='type-id-770' size-in-bits='64' id='type-id-384'/>
+    <qualified-type-def type-id='type-id-703' const='yes' id='type-id-771'/>
+    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-386'/>
+    <qualified-type-def type-id='type-id-705' const='yes' id='type-id-772'/>
+    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-394'/>
+    <qualified-type-def type-id='type-id-707' const='yes' id='type-id-773'/>
+    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-392'/>
+    <qualified-type-def type-id='type-id-709' const='yes' id='type-id-774'/>
+    <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-391'/>
+    <qualified-type-def type-id='type-id-711' const='yes' id='type-id-775'/>
+    <reference-type-def kind='lvalue' type-id='type-id-775' size-in-bits='64' id='type-id-776'/>
+    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-777'/>
+    <qualified-type-def type-id='type-id-713' const='yes' id='type-id-778'/>
+    <reference-type-def kind='lvalue' type-id='type-id-778' size-in-bits='64' id='type-id-779'/>
+    <pointer-type-def type-id='type-id-778' size-in-bits='64' id='type-id-695'/>
+    <qualified-type-def type-id='type-id-716' const='yes' id='type-id-780'/>
+    <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-380'/>
+    <qualified-type-def type-id='type-id-718' const='yes' id='type-id-781'/>
+    <pointer-type-def type-id='type-id-781' size-in-bits='64' id='type-id-397'/>
+    <qualified-type-def type-id='type-id-720' const='yes' id='type-id-782'/>
+    <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-381'/>
+    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-783'/>
+    <reference-type-def kind='lvalue' type-id='type-id-783' size-in-bits='64' id='type-id-784'/>
+    <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-785'/>
+    <qualified-type-def type-id='type-id-724' const='yes' id='type-id-786'/>
+    <pointer-type-def type-id='type-id-786' size-in-bits='64' id='type-id-389'/>
+    <qualified-type-def type-id='type-id-726' const='yes' id='type-id-787'/>
+    <pointer-type-def type-id='type-id-787' size-in-bits='64' id='type-id-390'/>
+    <qualified-type-def type-id='type-id-728' const='yes' id='type-id-788'/>
+    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-385'/>
+    <qualified-type-def type-id='type-id-730' const='yes' id='type-id-789'/>
+    <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-387'/>
+    <qualified-type-def type-id='type-id-675' const='yes' id='type-id-790'/>
+    <reference-type-def kind='lvalue' type-id='type-id-790' size-in-bits='64' id='type-id-791'/>
+    <pointer-type-def type-id='type-id-790' size-in-bits='64' id='type-id-399'/>
+    <qualified-type-def type-id='type-id-735' const='yes' id='type-id-792'/>
     <reference-type-def kind='lvalue' type-id='type-id-792' size-in-bits='64' id='type-id-793'/>
-    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-401'/>
-    <qualified-type-def type-id='type-id-737' const='yes' id='type-id-794'/>
-    <reference-type-def kind='lvalue' type-id='type-id-794' size-in-bits='64' id='type-id-795'/>
-    <pointer-type-def type-id='type-id-794' size-in-bits='64' id='type-id-796'/>
-    <qualified-type-def type-id='type-id-680' const='yes' id='type-id-797'/>
-    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-798'/>
+    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-794'/>
+    <qualified-type-def type-id='type-id-678' const='yes' id='type-id-795'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-796'/>
+    <qualified-type-def type-id='type-id-737' const='yes' id='type-id-797'/>
+    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-398'/>
+    <qualified-type-def type-id='type-id-738' const='yes' id='type-id-798'/>
+    <pointer-type-def type-id='type-id-798' size-in-bits='64' id='type-id-395'/>
     <qualified-type-def type-id='type-id-739' const='yes' id='type-id-799'/>
-    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-400'/>
-    <qualified-type-def type-id='type-id-740' const='yes' id='type-id-800'/>
-    <pointer-type-def type-id='type-id-800' size-in-bits='64' id='type-id-397'/>
-    <qualified-type-def type-id='type-id-741' const='yes' id='type-id-801'/>
-    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-395'/>
-    <qualified-type-def type-id='type-id-802' const='yes' id='type-id-803'/>
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
-    <qualified-type-def type-id='type-id-742' const='yes' id='type-id-805'/>
-    <reference-type-def kind='lvalue' type-id='type-id-805' size-in-bits='64' id='type-id-806'/>
-    <pointer-type-def type-id='type-id-805' size-in-bits='64' id='type-id-807'/>
-    <qualified-type-def type-id='type-id-744' const='yes' id='type-id-808'/>
-    <reference-type-def kind='lvalue' type-id='type-id-808' size-in-bits='64' id='type-id-809'/>
-    <pointer-type-def type-id='type-id-808' size-in-bits='64' id='type-id-810'/>
-    <qualified-type-def type-id='type-id-811' const='yes' id='type-id-812'/>
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-813'/>
-    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-814'/>
-    <reference-type-def kind='lvalue' type-id='type-id-814' size-in-bits='64' id='type-id-815'/>
-    <pointer-type-def type-id='type-id-814' size-in-bits='64' id='type-id-816'/>
-    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-817'/>
-    <reference-type-def kind='lvalue' type-id='type-id-817' size-in-bits='64' id='type-id-818'/>
-    <pointer-type-def type-id='type-id-817' size-in-bits='64' id='type-id-819'/>
-    <qualified-type-def type-id='type-id-688' const='yes' id='type-id-820'/>
-    <reference-type-def kind='lvalue' type-id='type-id-820' size-in-bits='64' id='type-id-821'/>
-    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-398'/>
-    <qualified-type-def type-id='type-id-764' const='yes' id='type-id-822'/>
-    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-403'/>
-    <qualified-type-def type-id='type-id-766' const='yes' id='type-id-823'/>
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-693'/>
-    <qualified-type-def type-id='type-id-768' const='yes' id='type-id-824'/>
-    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-402'/>
-    <reference-type-def kind='lvalue' type-id='type-id-130' size-in-bits='64' id='type-id-825'/>
-    <qualified-type-def type-id='type-id-696' const='yes' id='type-id-826'/>
-    <pointer-type-def type-id='type-id-826' size-in-bits='64' id='type-id-698'/>
-    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-827'/>
-    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-694'/>
-    <reference-type-def kind='lvalue' type-id='type-id-176' size-in-bits='64' id='type-id-385'/>
-    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-699'/>
-    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-695'/>
+    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-393'/>
+    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-801'/>
+    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
+    <qualified-type-def type-id='type-id-740' const='yes' id='type-id-803'/>
+    <reference-type-def kind='lvalue' type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
+    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-805'/>
+    <qualified-type-def type-id='type-id-742' const='yes' id='type-id-806'/>
+    <reference-type-def kind='lvalue' type-id='type-id-806' size-in-bits='64' id='type-id-807'/>
+    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-808'/>
+    <qualified-type-def type-id='type-id-809' const='yes' id='type-id-810'/>
+    <pointer-type-def type-id='type-id-810' size-in-bits='64' id='type-id-811'/>
+    <qualified-type-def type-id='type-id-682' const='yes' id='type-id-812'/>
+    <reference-type-def kind='lvalue' type-id='type-id-812' size-in-bits='64' id='type-id-813'/>
+    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-814'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-815'/>
+    <reference-type-def kind='lvalue' type-id='type-id-815' size-in-bits='64' id='type-id-816'/>
+    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-817'/>
+    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-818'/>
+    <reference-type-def kind='lvalue' type-id='type-id-818' size-in-bits='64' id='type-id-819'/>
+    <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-396'/>
+    <qualified-type-def type-id='type-id-762' const='yes' id='type-id-820'/>
+    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-401'/>
+    <qualified-type-def type-id='type-id-764' const='yes' id='type-id-821'/>
+    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-691'/>
+    <qualified-type-def type-id='type-id-766' const='yes' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-400'/>
+    <reference-type-def kind='lvalue' type-id='type-id-130' size-in-bits='64' id='type-id-823'/>
+    <qualified-type-def type-id='type-id-694' const='yes' id='type-id-824'/>
+    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-696'/>
+    <qualified-type-def type-id='type-id-690' const='yes' id='type-id-825'/>
+    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-692'/>
+    <reference-type-def kind='lvalue' type-id='type-id-174' size-in-bits='64' id='type-id-383'/>
+    <pointer-type-def type-id='type-id-694' size-in-bits='64' id='type-id-697'/>
+    <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-693'/>
     <namespace-decl name='OT'>
-      <class-decl name='BEInt&lt;short unsigned int, 2&gt;' is-struct='yes' visibility='default' id='type-id-828'/>
-      <class-decl name='BEInt&lt;unsigned int, 4&gt;' is-struct='yes' visibility='default' id='type-id-829'/>
-      <class-decl name='FixedVersion' is-struct='yes' visibility='default' id='type-id-830'/>
-      <class-decl name='IntType&lt;short int, 2u&gt;' is-struct='yes' visibility='default' id='type-id-831'/>
-      <class-decl name='IntType&lt;short unsigned int, 2u&gt;' is-struct='yes' visibility='default' id='type-id-832'/>
-      <class-decl name='IntType&lt;unsigned int, 4u&gt;' is-struct='yes' visibility='default' id='type-id-833'/>
-      <class-decl name='hb_sanitize_context_t' is-struct='yes' visibility='default' id='type-id-834'/>
-      <class-decl name='hb_serialize_context_t' is-struct='yes' visibility='default' id='type-id-835'/>
-      <class-decl name='Sanitizer&lt;OT::_hea&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-836'>
+      <class-decl name='BEInt&lt;short unsigned int, 2&gt;' is-struct='yes' visibility='default' id='type-id-826'/>
+      <class-decl name='BEInt&lt;unsigned int, 4&gt;' is-struct='yes' visibility='default' id='type-id-827'/>
+      <class-decl name='FixedVersion' is-struct='yes' visibility='default' id='type-id-828'/>
+      <class-decl name='IntType&lt;short int, 2u&gt;' is-struct='yes' visibility='default' id='type-id-829'/>
+      <class-decl name='IntType&lt;short unsigned int, 2u&gt;' is-struct='yes' visibility='default' id='type-id-830'/>
+      <class-decl name='IntType&lt;unsigned int, 4u&gt;' is-struct='yes' visibility='default' id='type-id-831'/>
+      <class-decl name='hb_sanitize_context_t' is-struct='yes' visibility='default' id='type-id-832'/>
+      <class-decl name='hb_serialize_context_t' is-struct='yes' visibility='default' id='type-id-833'/>
+      <class-decl name='Sanitizer&lt;OT::_hea&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-834'>
         <member-function access='public' static='yes'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4_heaEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
@@ -7061,11 +7054,11 @@
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_4_heaEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
-            <return type-id='type-id-403'/>
+            <return type-id='type-id-401'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Sanitizer&lt;OT::_mtx&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-837'>
+      <class-decl name='Sanitizer&lt;OT::_mtx&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-835'>
         <member-function access='public' static='yes'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4_mtxEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
@@ -7075,11 +7068,11 @@
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_4_mtxEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
-            <return type-id='type-id-693'/>
+            <return type-id='type-id-691'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Sanitizer&lt;OT::cmap&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-838'>
+      <class-decl name='Sanitizer&lt;OT::cmap&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-836'>
         <member-function access='public' static='yes'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4cmapEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
@@ -7089,24 +7082,24 @@
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_4cmapEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
-            <return type-id='type-id-402'/>
+            <return type-id='type-id-400'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BEInt&lt;unsigned int, 3&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-713'>
+      <class-decl name='BEInt&lt;unsigned int, 3&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-711'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-690' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
+          <var-decl name='v' type-id='type-id-688' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator unsigned int' mangled-name='_ZNK2OT5BEIntIjLi3EEcvjEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-779' is-artificial='yes'/>
+            <parameter type-id='type-id-777' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='IntType&lt;unsigned int, 3u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-737'>
+      <class-decl name='IntType&lt;unsigned int, 3u&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-735'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-713' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-711' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
@@ -7116,20 +7109,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeIjLj3EE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-796' is-artificial='yes'/>
+            <parameter type-id='type-id-794' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator unsigned int' mangled-name='_ZNK2OT7IntTypeIjLj3EEcvjEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-796' is-artificial='yes'/>
+            <parameter type-id='type-id-794' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-739'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+      <class-decl name='OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-737'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -7138,29 +7131,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12CmapSubtableENS_7IntTypeIjLj4EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-380' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-378' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12CmapSubtableENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-380' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-378' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12CmapSubtableENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-400' is-artificial='yes'/>
+            <parameter type-id='type-id-398' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-781'/>
+            <return type-id='type-id-779'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-740'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+      <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-738'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -7169,29 +7162,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_13SortedArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEES4_E6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-379' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-377' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_13SortedArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-379' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-377' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13SortedArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEES4_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-397' is-artificial='yes'/>
+            <parameter type-id='type-id-395' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-806'/>
+            <return type-id='type-id-804'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-741'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+      <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-739'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -7200,346 +7193,346 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_13SortedArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEEES4_E6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-378' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-376' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_13SortedArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-378' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-376' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13SortedArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEEES4_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-395' is-artificial='yes'/>
+            <parameter type-id='type-id-393' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-809'/>
+            <return type-id='type-id-807'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-700'>
+      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-698'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-674' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_21CmapSubtableLongGroupENS_7IntTypeIjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_21CmapSubtableLongGroupENS_7IntTypeIjLj4EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-390' is-artificial='yes'/>
+            <parameter type-id='type-id-388' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-786'/>
+            <return type-id='type-id-784'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_21CmapSubtableLongGroupENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-702'>
+      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-700'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-678' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='lsearch&lt;OT::EncodingRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-381' is-artificial='yes'/>
-            <parameter type-id='type-id-793'/>
+            <parameter type-id='type-id-379' is-artificial='yes'/>
+            <parameter type-id='type-id-791'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_14EncodingRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-703' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_14EncodingRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-703' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_14EncodingRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-381' is-artificial='yes'/>
+            <parameter type-id='type-id-379' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-793'/>
+            <return type-id='type-id-791'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-704'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-702'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-677' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-560' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_E8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-560' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEES2_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-386' is-artificial='yes'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-294'/>
+            <return type-id='type-id-292'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEES2_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-386' is-artificial='yes'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEES2_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-386' is-artificial='yes'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-295'/>
+            <return type-id='type-id-293'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-560' is-artificial='yes'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_E9serializeEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='818' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-560' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEES2_E9serializeEPNS_22hb_serialize_context_tERNS_8SupplierIS2_EEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='828' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-560' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-558' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-705'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-703'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-677' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEENS1_IjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-706' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeItLj2EEENS1_IjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-706' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEENS1_IjLj4EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-388' is-artificial='yes'/>
+            <parameter type-id='type-id-386' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-294'/>
+            <return type-id='type-id-292'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-707'>
+      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-705'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-708' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-708' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-396' is-artificial='yes'/>
+            <parameter type-id='type-id-394' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-815'/>
+            <return type-id='type-id-813'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-709'>
+      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-707'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-687' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-710' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-710' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-711'>
+      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-709'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-689' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-687' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_23VariationSelectorRecordENS_7IntTypeIjLj4EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-712' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_23VariationSelectorRecordENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-712' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_23VariationSelectorRecordENS_7IntTypeIjLj4EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-393' is-artificial='yes'/>
+            <parameter type-id='type-id-391' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-821'/>
+            <return type-id='type-id-819'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-802'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-700'/>
+      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-800'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-698'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-804' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-802' is-artificial='yes'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-839'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
+      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-837'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-700'/>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-742'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
+      <class-decl name='SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-740'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-705'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-807' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-744'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-709'/>
+      <class-decl name='SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-742'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-810' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-808' is-artificial='yes'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-811'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-711'/>
+      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-809'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-709'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-813' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-811' is-artificial='yes'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableFormat0' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-718'>
+      <class-decl name='CmapSubtableFormat0' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-716'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='60' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='lengthZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='61' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='61' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='languageZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='62' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='glyphIdArray' type-id='type-id-673' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-671' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
@@ -7549,73 +7542,73 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT19CmapSubtableFormat08sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableFormat09get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-382' is-artificial='yes'/>
+            <parameter type-id='type-id-380' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-127'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableFormat4' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-722'>
+      <class-decl name='CmapSubtableFormat4' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-720'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='150' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='150' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='length' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='151' column='1'/>
+          <var-decl name='length' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='151' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='languageZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='153' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='153' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='segCountX2' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='154' column='1'/>
+          <var-decl name='segCountX2' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='154' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='searchRangeZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='155' column='1'/>
+          <var-decl name='searchRangeZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='155' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='entrySelectorZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='156' column='1'/>
+          <var-decl name='entrySelectorZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='156' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='rangeShiftZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='157' column='1'/>
+          <var-decl name='rangeShiftZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='157' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
-          <var-decl name='values' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
+          <var-decl name='values' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='171' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT19CmapSubtableFormat48sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-723' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableFormat49get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-383' is-artificial='yes'/>
+            <parameter type-id='type-id-381' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-127'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableLongGroup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='175' column='1' id='type-id-675'>
+      <class-decl name='CmapSubtableLongGroup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='175' column='1' id='type-id-673'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='startCharCode' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='192' column='1'/>
+          <var-decl name='startCharCode' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='192' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='32'>
-          <var-decl name='endCharCode' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='193' column='1'/>
+          <var-decl name='endCharCode' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='193' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='glyphID' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='194' column='1'/>
+          <var-decl name='glyphID' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
@@ -7625,190 +7618,190 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT21CmapSubtableLongGroup3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-787' is-artificial='yes'/>
+            <parameter type-id='type-id-785' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-730'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-728'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='formatReserved' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
+          <var-decl name='formatReserved' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='lengthZ' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='220' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='220' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='languageZ' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='221' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='221' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='startCharCode' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
+          <var-decl name='startCharCode' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='glyphIdArray' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='227' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT19CmapSubtableTrimmedINS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-731' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-729' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableTrimmedINS_7IntTypeItLj2EEEE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-387' is-artificial='yes'/>
+            <parameter type-id='type-id-385' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-127'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-732'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-730'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='formatReserved' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
+          <var-decl name='formatReserved' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='lengthZ' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='220' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='220' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='languageZ' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='221' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='221' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='startCharCode' type-id='type-id-241' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
+          <var-decl name='startCharCode' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='glyphIdArray' type-id='type-id-705' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-703' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='227' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT19CmapSubtableTrimmedINS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-733' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableTrimmedINS_7IntTypeIjLj4EEEE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-389' is-artificial='yes'/>
+            <parameter type-id='type-id-387' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-127'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableFormat6' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='230' column='1' id='type-id-840'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-730'/>
+      <class-decl name='CmapSubtableFormat6' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='230' column='1' id='type-id-838'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-728'/>
       </class-decl>
-      <class-decl name='CmapSubtableFormat10' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='231' column='1' id='type-id-841'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-732'/>
+      <class-decl name='CmapSubtableFormat10' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='231' column='1' id='type-id-839'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-730'/>
       </class-decl>
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-726'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-724'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='reservedZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='252' column='1'/>
+          <var-decl name='reservedZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='252' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='lengthZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='253' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='253' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='languageZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='groups' type-id='type-id-802' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat12EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-727' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat12EE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-391' is-artificial='yes'/>
+            <parameter type-id='type-id-389' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-127'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-728'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-726'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='reservedZ' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='252' column='1'/>
+          <var-decl name='reservedZ' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='252' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='lengthZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='253' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='253' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='languageZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
+          <var-decl name='languageZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='groups' type-id='type-id-802' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat13EE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-729' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-727' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat13EE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-392' is-artificial='yes'/>
+            <parameter type-id='type-id-390' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-127'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableFormat12' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='262' column='1' id='type-id-842'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-726'/>
+      <class-decl name='CmapSubtableFormat12' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='262' column='1' id='type-id-840'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-724'/>
         <member-function access='public' static='yes'>
           <function-decl name='group_get_glyph' mangled-name='_ZN2OT20CmapSubtableFormat1215group_get_glyphERKNS_21CmapSubtableLongGroupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-786'/>
+            <parameter type-id='type-id-784'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-64'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableFormat13' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='269' column='1' id='type-id-843'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-728'/>
+      <class-decl name='CmapSubtableFormat13' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='269' column='1' id='type-id-841'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-726'/>
         <member-function access='public' static='yes'>
           <function-decl name='group_get_glyph' mangled-name='_ZN2OT20CmapSubtableFormat1315group_get_glyphERKNS_21CmapSubtableLongGroupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-786'/>
+            <parameter type-id='type-id-784'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-64'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <enum-decl name='glyph_variant_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='275' column='1' id='type-id-844'>
+      <enum-decl name='glyph_variant_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='275' column='1' id='type-id-842'>
         <underlying-type type-id='type-id-11'/>
         <enumerator name='GLYPH_VARIANT_NOT_FOUND' value='0'/>
         <enumerator name='GLYPH_VARIANT_FOUND' value='1'/>
         <enumerator name='GLYPH_VARIANT_USE_DEFAULT' value='2'/>
       </enum-decl>
-      <class-decl name='UnicodeValueRange' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='283' column='1' id='type-id-686'>
+      <class-decl name='UnicodeValueRange' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='283' column='1' id='type-id-684'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='startUnicodeValue' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
+          <var-decl name='startUnicodeValue' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
-          <var-decl name='additionalCount' type-id='type-id-672' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='297' column='1'/>
+          <var-decl name='additionalCount' type-id='type-id-670' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='297' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='300' column='1'/>
@@ -7818,18 +7811,18 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT17UnicodeValueRange3cmpERKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-819' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-817' is-artificial='yes'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='UVSMapping' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='306' column='1' id='type-id-684'>
+      <class-decl name='UVSMapping' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='306' column='1' id='type-id-682'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='unicodeValue' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
+          <var-decl name='unicodeValue' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
-          <var-decl name='glyphID' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
+          <var-decl name='glyphID' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='320' column='1'/>
@@ -7839,21 +7832,21 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT10UVSMapping3cmpERKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='307' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-816' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='VariationSelectorRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-688'>
+      <class-decl name='VariationSelectorRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-686'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='varSelector' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
+          <var-decl name='varSelector' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
-          <var-decl name='defaultUVS' type-id='type-id-741' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='360' column='1'/>
+          <var-decl name='defaultUVS' type-id='type-id-739' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='360' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='56'>
-          <var-decl name='nonDefaultUVS' type-id='type-id-740' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='362' column='1'/>
+          <var-decl name='nonDefaultUVS' type-id='type-id-738' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='362' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='364' column='1'/>
@@ -7863,106 +7856,106 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT23VariationSelectorRecord3cmpERKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-398' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-396' is-artificial='yes'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT23VariationSelectorRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-763' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-761' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT23VariationSelectorRecord9get_glyphEjPjPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-398' is-artificial='yes'/>
+            <parameter type-id='type-id-396' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-127'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-844'/>
+            <return type-id='type-id-842'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtableFormat14' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-720'>
+      <class-decl name='CmapSubtableFormat14' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-718'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='383' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='383' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='lengthZ' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='384' column='1'/>
+          <var-decl name='lengthZ' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='384' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='record' type-id='type-id-811' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
+          <var-decl name='record' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='389' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT20CmapSubtableFormat148sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph_variant' mangled-name='_ZNK2OT20CmapSubtableFormat1417get_glyph_variantEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='369' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-399' is-artificial='yes'/>
+            <parameter type-id='type-id-397' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-127'/>
-            <return type-id='type-id-844'/>
+            <return type-id='type-id-842'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CmapSubtable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='393' column='1' id='type-id-715'>
+      <class-decl name='CmapSubtable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='393' column='1' id='type-id-713'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='2096' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='437' column='1' id='type-id-847'>
+          <union-decl name='__anonymous_union__' size-in-bits='2096' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='437' column='1' id='type-id-845'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='438' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='438' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format0' type-id='type-id-718' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
+              <var-decl name='format0' type-id='type-id-716' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format4' type-id='type-id-722' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
+              <var-decl name='format4' type-id='type-id-720' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format6' type-id='type-id-840' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='441' column='1'/>
+              <var-decl name='format6' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='441' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format10' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='442' column='1'/>
+              <var-decl name='format10' type-id='type-id-839' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='442' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format12' type-id='type-id-842' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='443' column='1'/>
+              <var-decl name='format12' type-id='type-id-840' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='443' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format13' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='444' column='1'/>
+              <var-decl name='format13' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='444' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format14' type-id='type-id-720' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
+              <var-decl name='format14' type-id='type-id-718' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='446' column='1'/>
+          <var-decl name='u' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='446' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='448' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_glyph_variant' mangled-name='_ZNK2OT12CmapSubtable17get_glyph_variantEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-697' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-127'/>
-            <return type-id='type-id-844'/>
+            <return type-id='type-id-842'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT12CmapSubtable9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='396' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-697' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-127'/>
             <return type-id='type-id-1'/>
@@ -7970,21 +7963,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12CmapSubtable8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-717' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='EncodingRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-677'>
+      <class-decl name='EncodingRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-675'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='platformID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='470' column='1'/>
+          <var-decl name='platformID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='470' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='encodingID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='471' column='1'/>
+          <var-decl name='encodingID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='471' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='subtable' type-id='type-id-739' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='473' column='1'/>
+          <var-decl name='subtable' type-id='type-id-737' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='473' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='475' column='1'/>
@@ -7994,109 +7987,109 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT14EncodingRecord3cmpERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-401' is-artificial='yes'/>
-            <parameter type-id='type-id-793'/>
+            <parameter type-id='type-id-399' is-artificial='yes'/>
+            <parameter type-id='type-id-791'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT14EncodingRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='464' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-735' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-733' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='cmap' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-768'>
+      <class-decl name='cmap' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-766'>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='480' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='480' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='version' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='506' column='1'/>
+          <var-decl name='version' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='506' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='encodingRecord' type-id='type-id-839' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
+          <var-decl name='encodingRecord' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='510' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='find_subtable' mangled-name='_ZNK2OT4cmap13find_subtableEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-402' is-artificial='yes'/>
+            <parameter type-id='type-id-400' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-697'/>
+            <return type-id='type-id-695'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4cmap8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-769' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-767' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_hea' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-764'>
+      <class-decl name='_hea' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-762'>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='47' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='47' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='hheaTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='49' column='1'/>
+          <var-decl name='hheaTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='49' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='vheaTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='50' column='1'/>
+          <var-decl name='vheaTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='50' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='58' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='58' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='ascender' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
+          <var-decl name='ascender' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
-          <var-decl name='descender' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
+          <var-decl name='descender' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='lineGap' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
+          <var-decl name='lineGap' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='80'>
-          <var-decl name='advanceMax' type-id='type-id-849' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
+          <var-decl name='advanceMax' type-id='type-id-847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
-          <var-decl name='minLeadingBearing' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
+          <var-decl name='minLeadingBearing' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='112'>
-          <var-decl name='minTrailingBearing' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
+          <var-decl name='minTrailingBearing' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='maxExtent' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
+          <var-decl name='maxExtent' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='144'>
-          <var-decl name='caretSlopeRise' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='71' column='1'/>
+          <var-decl name='caretSlopeRise' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='71' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
-          <var-decl name='caretSlopeRun' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='74' column='1'/>
+          <var-decl name='caretSlopeRun' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='176'>
-          <var-decl name='caretOffset' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='75' column='1'/>
+          <var-decl name='caretOffset' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='75' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='reserved1' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='80' column='1'/>
+          <var-decl name='reserved1' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='80' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='208'>
-          <var-decl name='reserved2' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='81' column='1'/>
+          <var-decl name='reserved2' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='81' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='224'>
-          <var-decl name='reserved3' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='82' column='1'/>
+          <var-decl name='reserved3' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='82' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='240'>
-          <var-decl name='reserved4' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='83' column='1'/>
+          <var-decl name='reserved4' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='83' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='metricDataFormat' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='84' column='1'/>
+          <var-decl name='metricDataFormat' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='84' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='272'>
-          <var-decl name='numberOfLongMetrics' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='85' column='1'/>
+          <var-decl name='numberOfLongMetrics' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='85' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='88' column='1'/>
@@ -8106,18 +8099,18 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4_hea8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-765' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-763' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LongMetric' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='46' column='1' id='type-id-680'>
+      <class-decl name='LongMetric' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='46' column='1' id='type-id-678'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='advance' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='47' column='1'/>
+          <var-decl name='advance' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='47' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='lsb' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='48' column='1'/>
+          <var-decl name='lsb' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='48' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
@@ -8126,80 +8119,80 @@
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='_mtx' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='54' column='1' id='type-id-766'>
+      <class-decl name='_mtx' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='54' column='1' id='type-id-764'>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='55' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='55' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='hmtxTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='57' column='1'/>
+          <var-decl name='hmtxTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='57' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='vmtxTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='58' column='1'/>
+          <var-decl name='vmtxTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='58' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='longMetric' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='68' column='1'/>
+          <var-decl name='longMetric' type-id='type-id-679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='68' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='leadingBearingX' type-id='type-id-682' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='76' column='1'/>
+          <var-decl name='leadingBearingX' type-id='type-id-680' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='90' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4_mtx8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-767' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-765' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Supplier&lt;OT::CmapSubtableLongGroup&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-746'/>
-      <class-decl name='Supplier&lt;OT::EncodingRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-748'/>
-      <class-decl name='Supplier&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-750'>
+      <class-decl name='Supplier&lt;OT::CmapSubtableLongGroup&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-744'/>
+      <class-decl name='Supplier&lt;OT::EncodingRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-746'/>
+      <class-decl name='Supplier&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-748'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='511' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='head' type-id='type-id-295' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
+          <var-decl name='head' type-id='type-id-293' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <parameter type-id='type-id-293'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
-            <parameter type-id='type-id-851'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <parameter type-id='type-id-849'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierINS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-852' is-artificial='yes'/>
+            <parameter type-id='type-id-850' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-293'/>
+            <return type-id='type-id-291'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='advance' mangled-name='_ZN2OT8SupplierINS_7IntTypeItLj2EEEE7advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Supplier&lt;OT::UVSMapping&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-752'/>
-      <class-decl name='Supplier&lt;OT::UnicodeValueRange&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-754'/>
-      <class-decl name='Supplier&lt;OT::VariationSelectorRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-756'/>
-      <typedef-decl name='BYTE' type-id='type-id-76' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='631' column='1' id='type-id-672'/>
-      <typedef-decl name='UINT24' type-id='type-id-737' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-845'/>
-      <typedef-decl name='FWORD' type-id='type-id-575' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-848'/>
-      <typedef-decl name='UFWORD' type-id='type-id-373' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-849'/>
-      <typedef-decl name='GlyphID' type-id='type-id-373' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-846'/>
+      <class-decl name='Supplier&lt;OT::UVSMapping&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-750'/>
+      <class-decl name='Supplier&lt;OT::UnicodeValueRange&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-752'/>
+      <class-decl name='Supplier&lt;OT::VariationSelectorRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-754'/>
+      <typedef-decl name='BYTE' type-id='type-id-76' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='631' column='1' id='type-id-670'/>
+      <typedef-decl name='UINT24' type-id='type-id-735' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-843'/>
+      <typedef-decl name='FWORD' type-id='type-id-573' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-846'/>
+      <typedef-decl name='UFWORD' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-847'/>
+      <typedef-decl name='GlyphID' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-844'/>
     </namespace-decl>
     <function-decl name='hb_ot_font_set_funcs' mangled-name='hb_ot_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_font_set_funcs'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1'/>
@@ -8207,222 +8200,222 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+    <array-type-def dimensions='1' type-id='type-id-851' id='type-id-852'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
+    </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-853' id='type-id-854'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-855' id='type-id-856'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-735' id='type-id-855'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-737' id='type-id-857'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-856' id='type-id-857'>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-858' id='type-id-859'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-860' id='type-id-861'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-862' id='type-id-863'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-864' id='type-id-865'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-866' id='type-id-867'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-868' id='type-id-869'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-870' id='type-id-871'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-872' id='type-id-873'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-874' id='type-id-875'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-876' id='type-id-877'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-878' id='type-id-879'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-880' id='type-id-881'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-882' id='type-id-883'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-884' id='type-id-885'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-886' id='type-id-887'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-888' id='type-id-889'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-890' id='type-id-891'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-892' id='type-id-893'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-894' id='type-id-895'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-896' id='type-id-897'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-898' id='type-id-899'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-900' id='type-id-901'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-902' id='type-id-903'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-904' id='type-id-905'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-906' id='type-id-907'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-908' id='type-id-909'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-910' id='type-id-911'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-912' id='type-id-913'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-914' id='type-id-915'>
-      <subrange length='1' type-id='type-id-4' id='type-id-181'/>
+      <subrange length='1' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16' id='type-id-916'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16' id='type-id-914'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-917' size-in-bits='2304' id='type-id-918'>
+    <array-type-def dimensions='1' type-id='type-id-915' size-in-bits='2304' id='type-id-916'>
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-919' size-in-bits='2048' id='type-id-920'>
-      <subrange length='32' type-id='type-id-4' id='type-id-921'/>
+    <array-type-def dimensions='1' type-id='type-id-917' size-in-bits='2048' id='type-id-918'>
+      <subrange length='32' type-id='type-id-4' id='type-id-919'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-922' size-in-bits='512' id='type-id-923'>
+    <array-type-def dimensions='1' type-id='type-id-920' size-in-bits='512' id='type-id-921'>
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-924' size-in-bits='4352' id='type-id-925'>
+    <array-type-def dimensions='1' type-id='type-id-922' size-in-bits='4352' id='type-id-923'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-926' size-in-bits='1280' id='type-id-927'>
+    <array-type-def dimensions='1' type-id='type-id-924' size-in-bits='1280' id='type-id-925'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-187' size-in-bits='64' id='type-id-928'>
+    <array-type-def dimensions='1' type-id='type-id-185' size-in-bits='64' id='type-id-926'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-929'>
-      <subrange length='3' type-id='type-id-4' id='type-id-691'/>
+    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-927'>
+      <subrange length='3' type-id='type-id-4' id='type-id-689'/>
     </array-type-def>
-    <class-decl name='hb_ot_layout_lookup_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='121' column='1' id='type-id-930'>
+    <class-decl name='hb_ot_layout_lookup_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='121' column='1' id='type-id-928'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='digest' type-id='type-id-931' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='134' column='1'/>
+        <var-decl name='digest' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='134' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='fini&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-932' is-artificial='yes'/>
-          <parameter type-id='type-id-933'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
+          <parameter type-id='type-id-931'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='fini&lt;OT::PosLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-932' is-artificial='yes'/>
-          <parameter type-id='type-id-934'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
+          <parameter type-id='type-id-932'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-932' is-artificial='yes'/>
-          <parameter type-id='type-id-933'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
+          <parameter type-id='type-id-931'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init&lt;OT::PosLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-932' is-artificial='yes'/>
-          <parameter type-id='type-id-934'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
+          <parameter type-id='type-id-932'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='fini&lt;OT::SubstLookup*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-932' is-artificial='yes'/>
-          <parameter type-id='type-id-935'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
+          <parameter type-id='type-id-933'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-932' is-artificial='yes'/>
-          <parameter type-id='type-id-933'/>
+          <parameter type-id='type-id-930' is-artificial='yes'/>
+          <parameter type-id='type-id-931'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='GSUBProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='804' column='1' id='type-id-936'>
+    <class-decl name='GSUBProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='804' column='1' id='type-id-934'>
       <member-type access='public'>
-        <typedef-decl name='Lookup' type-id='type-id-938' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='807' column='1' id='type-id-937'/>
+        <typedef-decl name='Lookup' type-id='type-id-936' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='807' column='1' id='type-id-935'/>
       </member-type>
       <data-member access='public' static='yes'>
         <var-decl name='table_index' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='805' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='inplace' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='806' column='1'/>
+        <var-decl name='inplace' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='806' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='table' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='813' column='1'/>
+        <var-decl name='table' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='813' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='accels' type-id='type-id-941' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='814' column='1'/>
+        <var-decl name='accels' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='814' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='GSUBProxy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='809' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-942' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-940' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='GPOSProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='818' column='1' id='type-id-943'>
+    <class-decl name='GPOSProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='818' column='1' id='type-id-941'>
       <member-type access='public'>
-        <typedef-decl name='Lookup' type-id='type-id-945' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='821' column='1' id='type-id-944'/>
+        <typedef-decl name='Lookup' type-id='type-id-943' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='821' column='1' id='type-id-942'/>
       </member-type>
       <data-member access='public' static='yes'>
         <var-decl name='table_index' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='819' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='inplace' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='820' column='1'/>
+        <var-decl name='inplace' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='820' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='table' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='827' column='1'/>
+        <var-decl name='table' type-id='type-id-944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='827' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='accels' type-id='type-id-941' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='828' column='1'/>
+        <var-decl name='accels' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='828' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='GPOSProxy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-947' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-945' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <enum-decl name='hb_ot_layout_glyph_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.h' line='54' column='1' id='type-id-948'>
+    <enum-decl name='hb_ot_layout_glyph_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.h' line='54' column='1' id='type-id-946'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED' value='0'/>
       <enumerator name='HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH' value='1'/>
@@ -8430,11 +8423,11 @@
       <enumerator name='HB_OT_LAYOUT_GLYPH_CLASS_MARK' value='3'/>
       <enumerator name='HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT' value='4'/>
     </enum-decl>
-    <class-decl name='hb_ot_map_t' size-in-bits='8192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='40' column='1' id='type-id-949'>
+    <class-decl name='hb_ot_map_t' size-in-bits='8192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='40' column='1' id='type-id-947'>
       <member-type access='public'>
-        <class-decl name='feature_map_t' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='45' column='1' id='type-id-917'>
+        <class-decl name='feature_map_t' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='45' column='1' id='type-id-915'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='tag' type-id='type-id-187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='46' column='1'/>
+            <var-decl name='tag' type-id='type-id-185' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='46' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='index' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='47' column='1'/>
@@ -8459,15 +8452,15 @@
           </data-member>
           <member-function access='public' static='yes'>
             <function-decl name='cmp' mangled-name='_ZN11hb_ot_map_t13feature_map_t3cmpEPKS0_S2_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-950'/>
-              <parameter type-id='type-id-950'/>
+              <parameter type-id='type-id-948'/>
+              <parameter type-id='type-id-948'/>
               <return type-id='type-id-9'/>
             </function-decl>
           </member-function>
         </class-decl>
       </member-type>
       <member-type access='public'>
-        <class-decl name='lookup_map_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='59' column='1' id='type-id-919'>
+        <class-decl name='lookup_map_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='59' column='1' id='type-id-917'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='index' type-id='type-id-81' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='60' column='1'/>
           </data-member>
@@ -8479,55 +8472,55 @@
           </data-member>
           <member-function access='public' static='yes'>
             <function-decl name='cmp' mangled-name='_ZN11hb_ot_map_t12lookup_map_t3cmpEPKS0_S2_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-951'/>
-              <parameter type-id='type-id-951'/>
+              <parameter type-id='type-id-949'/>
+              <parameter type-id='type-id-949'/>
               <return type-id='type-id-9'/>
             </function-decl>
           </member-function>
         </class-decl>
       </member-type>
       <member-type access='public'>
-        <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-922'>
+        <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-920'>
           <member-type access='public'>
-            <typedef-decl name='pause_func_t' type-id='type-id-953' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-952'/>
+            <typedef-decl name='pause_func_t' type-id='type-id-951' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-950'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='last_lookup' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='71' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='pause_func' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='72' column='1'/>
+            <var-decl name='pause_func' type-id='type-id-950' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='72' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='chosen_script' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='137' column='1'/>
+        <var-decl name='chosen_script' type-id='type-id-926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='found_script' type-id='type-id-916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='138' column='1'/>
+        <var-decl name='found_script' type-id='type-id-914' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <var-decl name='global_mask' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='148' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='features' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='150' column='1'/>
+        <var-decl name='features' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='150' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
-        <var-decl name='lookups' type-id='type-id-925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='151' column='1'/>
+        <var-decl name='lookups' type-id='type-id-923' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='151' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6912'>
-        <var-decl name='stages' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='152' column='1'/>
+        <var-decl name='stages' type-id='type-id-925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='152' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='apply&lt;GSUBProxy&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='902' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
-          <parameter type-id='type-id-957'/>
-          <parameter type-id='type-id-958'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
+          <parameter type-id='type-id-955'/>
+          <parameter type-id='type-id-956'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-145'/>
           <return type-id='type-id-23'/>
@@ -8535,9 +8528,9 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='apply&lt;GPOSProxy&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='902' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
-          <parameter type-id='type-id-959'/>
-          <parameter type-id='type-id-958'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
+          <parameter type-id='type-id-957'/>
+          <parameter type-id='type-id-956'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-145'/>
           <return type-id='type-id-23'/>
@@ -8545,8 +8538,8 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='position' mangled-name='_ZNK11hb_ot_map_t8positionEPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
-          <parameter type-id='type-id-958'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
+          <parameter type-id='type-id-956'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-145'/>
           <return type-id='type-id-23'/>
@@ -8554,8 +8547,8 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='substitute' mangled-name='_ZNK11hb_ot_map_t10substituteEPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
-          <parameter type-id='type-id-958'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
+          <parameter type-id='type-id-956'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-145'/>
           <return type-id='type-id-23'/>
@@ -8563,22 +8556,22 @@
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='collect_lookups' mangled-name='_ZNK11hb_ot_map_t15collect_lookupsEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-960'/>
+          <parameter type-id='type-id-958'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='add_lookups' mangled-name='_ZN11hb_ot_map_t11add_lookupsEP9hb_face_tjjjb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-92'/>
@@ -8588,101 +8581,101 @@
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_global_mask' mangled-name='_ZNK11hb_ot_map_t15get_global_maskEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <return type-id='type-id-92'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_mask' mangled-name='_ZNK11hb_ot_map_t8get_maskEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
+          <parameter type-id='type-id-185'/>
           <parameter type-id='type-id-59'/>
           <return type-id='type-id-92'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN11hb_ot_map_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_1_mask' mangled-name='_ZNK11hb_ot_map_t10get_1_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
+          <parameter type-id='type-id-185'/>
           <return type-id='type-id-92'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='needs_fallback' mangled-name='_ZNK11hb_ot_map_t14needs_fallbackEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
+          <parameter type-id='type-id-185'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_feature_stage' mangled-name='_ZNK11hb_ot_map_t17get_feature_stageEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-185'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_stage_lookups' mangled-name='_ZNK11hb_ot_map_t17get_stage_lookupsEjjPPKNS_12lookup_map_tEPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-954' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-961'/>
+          <parameter type-id='type-id-959'/>
           <parameter type-id='type-id-59'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-955' is-artificial='yes'/>
+          <parameter type-id='type-id-953' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-962'/>
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::feature_map_t, 8u&gt;' size-in-bits='2432' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-954'>
+    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-960'/>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::feature_map_t, 8u&gt;' size-in-bits='2432' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-952'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
       </data-member>
@@ -8690,60 +8683,60 @@
         <var-decl name='allocated' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='array' type-id='type-id-963' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='static_array' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t13feature_map_tELj8EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-964' is-artificial='yes'/>
-          <return type-id='type-id-963'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
+          <return type-id='type-id-961'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='operator[]' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t13feature_map_tELj8EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-965'/>
+          <return type-id='type-id-963'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-966' is-artificial='yes'/>
-          <parameter type-id='type-id-967'/>
-          <return type-id='type-id-950'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-965'/>
+          <return type-id='type-id-948'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t13feature_map_tELj8EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-962' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-966' is-artificial='yes'/>
-          <parameter type-id='type-id-967'/>
-          <return type-id='type-id-950'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-965'/>
+          <return type-id='type-id-948'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-966' is-artificial='yes'/>
-          <parameter type-id='type-id-967'/>
-          <return type-id='type-id-950'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-965'/>
+          <return type-id='type-id-948'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-966' is-artificial='yes'/>
-          <parameter type-id='type-id-967'/>
-          <return type-id='type-id-950'/>
+          <parameter type-id='type-id-964' is-artificial='yes'/>
+          <parameter type-id='type-id-965'/>
+          <return type-id='type-id-948'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::lookup_map_t, 32u&gt;' size-in-bits='2176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-924'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::lookup_map_t, 32u&gt;' size-in-bits='2176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-922'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
       </data-member>
@@ -8751,27 +8744,27 @@
         <var-decl name='allocated' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='array' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-966' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='static_array' type-id='type-id-920' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='operator[]' mangled-name='_ZNK21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-969' is-artificial='yes'/>
+          <parameter type-id='type-id-967' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-970'/>
+          <return type-id='type-id-968'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-971' is-artificial='yes'/>
-          <return type-id='type-id-968'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
+          <return type-id='type-id-966'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='qsort' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EE5qsortEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
@@ -8779,26 +8772,26 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='operator[]' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-972'/>
+          <return type-id='type-id-970'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='shrink' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EE6shrinkEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t12lookup_map_tELj32EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-971' is-artificial='yes'/>
+          <parameter type-id='type-id-969' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::stage_map_t, 4u&gt;' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-926'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_t::stage_map_t, 4u&gt;' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-924'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
       </data-member>
@@ -8806,35 +8799,35 @@
         <var-decl name='allocated' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='array' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='static_array' type-id='type-id-923' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-921' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='operator[]' mangled-name='_ZNK21hb_prealloced_array_tIN11hb_ot_map_t11stage_map_tELj4EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-974' is-artificial='yes'/>
+          <parameter type-id='type-id-972' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-975'/>
+          <return type-id='type-id-973'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t11stage_map_tELj4EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-976' is-artificial='yes'/>
-          <return type-id='type-id-973'/>
+          <parameter type-id='type-id-974' is-artificial='yes'/>
+          <return type-id='type-id-971'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN11hb_ot_map_t11stage_map_tELj4EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-976' is-artificial='yes'/>
+          <parameter type-id='type-id-974' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_auto_trace_t&lt;0, const OT::Coverage&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-977'>
+    <class-decl name='hb_auto_trace_t&lt;0, const OT::Coverage&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-975'>
       <member-function access='public'>
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-978' is-artificial='yes'/>
+          <parameter type-id='type-id-976' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-17'/>
@@ -8846,15 +8839,15 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='ret' mangled-name='_ZN15hb_auto_trace_tILi0ERKN2OT8CoverageEE3retES3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-978' is-artificial='yes'/>
-          <parameter type-id='type-id-979'/>
+          <parameter type-id='type-id-976' is-artificial='yes'/>
+          <parameter type-id='type-id-977'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-979'/>
+          <return type-id='type-id-977'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-978' is-artificial='yes'/>
+          <parameter type-id='type-id-976' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-17'/>
@@ -8865,10 +8858,10 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_auto_trace_t&lt;0, const _hb_void_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-980'>
+    <class-decl name='hb_auto_trace_t&lt;0, const _hb_void_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-978'>
       <member-function access='public'>
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-981' is-artificial='yes'/>
+          <parameter type-id='type-id-979' is-artificial='yes'/>
           <parameter type-id='type-id-59'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-17'/>
@@ -8880,14 +8873,14 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='ret' mangled-name='_ZN15hb_auto_trace_tILi0ERK10_hb_void_tE3retES2_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-981' is-artificial='yes'/>
-          <parameter type-id='type-id-982'/>
+          <parameter type-id='type-id-979' is-artificial='yes'/>
+          <parameter type-id='type-id-980'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-982'/>
+          <return type-id='type-id-980'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-983'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-981'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -8908,34 +8901,34 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='may_have' mangled-name='_ZNK27hb_set_digest_lowest_bits_tImLj0EE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-984' is-artificial='yes'/>
+          <parameter type-id='type-id-982' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj0EE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-985' is-artificial='yes'/>
+          <parameter type-id='type-id-983' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj0EE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-985' is-artificial='yes'/>
+          <parameter type-id='type-id-983' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_range' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj0EE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-985' is-artificial='yes'/>
+          <parameter type-id='type-id-983' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-986'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-984'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -8956,34 +8949,34 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='may_have' mangled-name='_ZNK27hb_set_digest_lowest_bits_tImLj4EE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-987' is-artificial='yes'/>
+          <parameter type-id='type-id-985' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj4EE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-988' is-artificial='yes'/>
+          <parameter type-id='type-id-986' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj4EE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-988' is-artificial='yes'/>
+          <parameter type-id='type-id-986' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_range' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj4EE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-988' is-artificial='yes'/>
+          <parameter type-id='type-id-986' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-989'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-987'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -9004,79 +8997,79 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='may_have' mangled-name='_ZNK27hb_set_digest_lowest_bits_tImLj9EE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-990' is-artificial='yes'/>
+          <parameter type-id='type-id-988' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj9EE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-991' is-artificial='yes'/>
+          <parameter type-id='type-id-989' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj9EE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-991' is-artificial='yes'/>
+          <parameter type-id='type-id-989' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_range' mangled-name='_ZN27hb_set_digest_lowest_bits_tImLj9EE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-991' is-artificial='yes'/>
+          <parameter type-id='type-id-989' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-992'>
+    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-990'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-989' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-987' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='may_have' mangled-name='_ZNK24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj0EES0_ImLj9EEE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-993' is-artificial='yes'/>
+          <parameter type-id='type-id-991' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj0EES0_ImLj9EEE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-994' is-artificial='yes'/>
+          <parameter type-id='type-id-992' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj0EES0_ImLj9EEE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-994' is-artificial='yes'/>
+          <parameter type-id='type-id-992' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_range' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj0EES0_ImLj9EEE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-994' is-artificial='yes'/>
+          <parameter type-id='type-id-992' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;, hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-995'>
+    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;, hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-993'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-992' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='add_range' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES_IS0_ImLj0EES0_ImLj9EEEE9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-996' is-artificial='yes'/>
+          <parameter type-id='type-id-994' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
@@ -9084,43 +9077,44 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='add' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES_IS0_ImLj0EES0_ImLj9EEEE3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-996' is-artificial='yes'/>
+          <parameter type-id='type-id-994' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES_IS0_ImLj0EES0_ImLj9EEEE4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-996' is-artificial='yes'/>
+          <parameter type-id='type-id-994' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='may_have' mangled-name='_ZNK24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES_IS0_ImLj0EES0_ImLj9EEEE8may_haveEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-997' is-artificial='yes'/>
+          <parameter type-id='type-id-995' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-947'/>
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-942'/>
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-945'/>
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-940'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
     <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-999'/>
-    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1001'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1002' size-in-bits='64' id='type-id-1003'/>
-    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-1004'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1000' size-in-bits='64' id='type-id-1001'/>
+    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1002'/>
+    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
     <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1006'/>
     <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
-    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1010'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-1012'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1009' size-in-bits='64' id='type-id-1010'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1011'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1013'/>
     <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1015'/>
+    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-559'/>
     <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
-    <reference-type-def kind='lvalue' type-id='type-id-704' size-in-bits='64' id='type-id-561'/>
     <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
     <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1021'/>
-    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-1023'/>
-    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-545'/>
+    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-543'/>
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1024'/>
     <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-1026'/>
     <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1028'/>
     <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
@@ -9128,9 +9122,9 @@
     <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1034'/>
     <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
     <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1040'/>
-    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-566'/>
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-564'/>
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-564'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-562'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
     <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
     <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
     <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1048'/>
@@ -9143,204 +9137,204 @@
     <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
     <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1064'/>
     <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-1066'/>
-    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1068'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1069' size-in-bits='64' id='type-id-1070'/>
-    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-1071'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
-    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-1074'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-1068'/>
+    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1069'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1070' size-in-bits='64' id='type-id-1071'/>
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-1072'/>
+    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-1074'/>
     <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-1076'/>
     <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1078'/>
     <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1080'/>
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1082'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-1082'/>
     <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1084'/>
     <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1086'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
     <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-1090'/>
     <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1092'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1095' size-in-bits='64' id='type-id-1096'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1097'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1100'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1101' size-in-bits='64' id='type-id-1102'/>
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1103'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1095'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1098'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1101'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
     <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-1105'/>
     <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1107'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1109'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1108' size-in-bits='64' id='type-id-1109'/>
     <reference-type-def kind='lvalue' type-id='type-id-1110' size-in-bits='64' id='type-id-1111'/>
     <reference-type-def kind='lvalue' type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
     <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1117'/>
     <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-1119'/>
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-1121'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1122' size-in-bits='64' id='type-id-557'/>
-    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-539'/>
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1124'/>
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-549'/>
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1127'/>
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-553'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1120' size-in-bits='64' id='type-id-555'/>
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-537'/>
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1122'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-547'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-1125'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-551'/>
+    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1128'/>
     <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1130'/>
     <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-1132'/>
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1134'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1136'/>
-    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-1137'/>
-    <reference-type-def kind='lvalue' type-id='type-id-853' size-in-bits='64' id='type-id-1138'/>
-    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-1139'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1135'/>
+    <reference-type-def kind='lvalue' type-id='type-id-851' size-in-bits='64' id='type-id-1136'/>
+    <pointer-type-def type-id='type-id-851' size-in-bits='64' id='type-id-1137'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-1139'/>
     <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
     <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1143'/>
-    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-1145'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1147'/>
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1148'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1149' size-in-bits='64' id='type-id-1150'/>
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-1151'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1144' size-in-bits='64' id='type-id-1145'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-1146'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1147' size-in-bits='64' id='type-id-1148'/>
+    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-1149'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1151'/>
     <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
     <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1155'/>
     <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
     <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
     <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
     <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
-    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-1165'/>
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-568'/>
-    <reference-type-def kind='lvalue' type-id='type-id-855' size-in-bits='64' id='type-id-1167'/>
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1168'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1169' size-in-bits='64' id='type-id-1170'/>
-    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-1171'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1172' size-in-bits='64' id='type-id-1173'/>
-    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1174'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1175' size-in-bits='64' id='type-id-1176'/>
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1177'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-570'/>
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-540'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1179' size-in-bits='64' id='type-id-571'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-541'/>
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-1181'/>
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-563'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1183' size-in-bits='64' id='type-id-547'/>
-    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-544'/>
-    <reference-type-def kind='lvalue' type-id='type-id-858' size-in-bits='64' id='type-id-1184'/>
-    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1185'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1188'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-566'/>
+    <reference-type-def kind='lvalue' type-id='type-id-853' size-in-bits='64' id='type-id-1165'/>
+    <reference-type-def kind='lvalue' type-id='type-id-735' size-in-bits='64' id='type-id-1166'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1167' size-in-bits='64' id='type-id-1168'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1169'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1171'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1172'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1174'/>
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1175'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1176' size-in-bits='64' id='type-id-568'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-538'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-569'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-539'/>
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1179'/>
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-561'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-545'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-542'/>
+    <reference-type-def kind='lvalue' type-id='type-id-856' size-in-bits='64' id='type-id-1182'/>
+    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-1183'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1184' size-in-bits='64' id='type-id-1185'/>
+    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-1186'/>
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-1188'/>
     <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1192'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1193' size-in-bits='64' id='type-id-1194'/>
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1195'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1191' size-in-bits='64' id='type-id-1192'/>
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1193'/>
+    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-1195'/>
     <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1197'/>
     <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1199'/>
     <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1201'/>
     <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1203'/>
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-1205'/>
-    <reference-type-def kind='lvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1206'/>
-    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-1207'/>
+    <reference-type-def kind='lvalue' type-id='type-id-858' size-in-bits='64' id='type-id-1204'/>
+    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1205'/>
+    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1207'/>
     <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-1209'/>
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-1211'/>
-    <reference-type-def kind='lvalue' type-id='type-id-862' size-in-bits='64' id='type-id-1212'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1214'/>
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1215'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1217'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1218'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-1220'/>
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-1221'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1222' size-in-bits='64' id='type-id-1223'/>
-    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1224'/>
+    <reference-type-def kind='lvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1210'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1211' size-in-bits='64' id='type-id-1212'/>
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-1213'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1214' size-in-bits='64' id='type-id-1215'/>
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-1216'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1217' size-in-bits='64' id='type-id-1218'/>
+    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-1219'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1220' size-in-bits='64' id='type-id-1221'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1222'/>
+    <pointer-type-def type-id='type-id-862' size-in-bits='64' id='type-id-414'/>
+    <reference-type-def kind='lvalue' type-id='type-id-864' size-in-bits='64' id='type-id-1223'/>
     <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-416'/>
-    <reference-type-def kind='lvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1225'/>
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-418'/>
+    <reference-type-def kind='lvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1224'/>
+    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-419'/>
+    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-407'/>
     <reference-type-def kind='lvalue' type-id='type-id-868' size-in-bits='64' id='type-id-1226'/>
-    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-421'/>
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-409'/>
-    <reference-type-def kind='lvalue' type-id='type-id-870' size-in-bits='64' id='type-id-1228'/>
-    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-422'/>
-    <reference-type-def kind='lvalue' type-id='type-id-872' size-in-bits='64' id='type-id-1229'/>
-    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-427'/>
+    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-420'/>
+    <reference-type-def kind='lvalue' type-id='type-id-870' size-in-bits='64' id='type-id-1227'/>
+    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-425'/>
+    <reference-type-def kind='lvalue' type-id='type-id-872' size-in-bits='64' id='type-id-1228'/>
+    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-406'/>
     <reference-type-def kind='lvalue' type-id='type-id-874' size-in-bits='64' id='type-id-1230'/>
-    <pointer-type-def type-id='type-id-874' size-in-bits='64' id='type-id-428'/>
-    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-408'/>
-    <reference-type-def kind='lvalue' type-id='type-id-876' size-in-bits='64' id='type-id-1232'/>
-    <pointer-type-def type-id='type-id-876' size-in-bits='64' id='type-id-406'/>
-    <reference-type-def kind='lvalue' type-id='type-id-878' size-in-bits='64' id='type-id-1233'/>
-    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-424'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1234' size-in-bits='64' id='type-id-1235'/>
-    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-407'/>
-    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-439'/>
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-405'/>
-    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-404'/>
-    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-410'/>
-    <reference-type-def kind='lvalue' type-id='type-id-880' size-in-bits='64' id='type-id-1240'/>
-    <pointer-type-def type-id='type-id-880' size-in-bits='64' id='type-id-423'/>
-    <reference-type-def kind='lvalue' type-id='type-id-882' size-in-bits='64' id='type-id-1241'/>
-    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-430'/>
-    <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-1242'/>
-    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-431'/>
-    <reference-type-def kind='lvalue' type-id='type-id-886' size-in-bits='64' id='type-id-1243'/>
-    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-435'/>
-    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-417'/>
-    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-411'/>
-    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-419'/>
-    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-414'/>
-    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-420'/>
-    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-415'/>
-    <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1249'/>
-    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-433'/>
-    <reference-type-def kind='lvalue' type-id='type-id-892' size-in-bits='64' id='type-id-1250'/>
-    <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-437'/>
-    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-1251'/>
-    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-434'/>
-    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-413'/>
-    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-412'/>
-    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1254'/>
-    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-425'/>
+    <pointer-type-def type-id='type-id-874' size-in-bits='64' id='type-id-404'/>
+    <reference-type-def kind='lvalue' type-id='type-id-876' size-in-bits='64' id='type-id-1231'/>
+    <pointer-type-def type-id='type-id-876' size-in-bits='64' id='type-id-422'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1232' size-in-bits='64' id='type-id-1233'/>
+    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-437'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-403'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-402'/>
+    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-408'/>
+    <reference-type-def kind='lvalue' type-id='type-id-878' size-in-bits='64' id='type-id-1238'/>
+    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-421'/>
+    <reference-type-def kind='lvalue' type-id='type-id-880' size-in-bits='64' id='type-id-1239'/>
+    <pointer-type-def type-id='type-id-880' size-in-bits='64' id='type-id-428'/>
+    <reference-type-def kind='lvalue' type-id='type-id-882' size-in-bits='64' id='type-id-1240'/>
+    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-429'/>
+    <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-1241'/>
+    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-433'/>
+    <pointer-type-def type-id='type-id-1242' size-in-bits='64' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-409'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-418'/>
+    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-413'/>
+    <reference-type-def kind='lvalue' type-id='type-id-888' size-in-bits='64' id='type-id-1247'/>
+    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-431'/>
+    <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1248'/>
+    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-435'/>
+    <reference-type-def kind='lvalue' type-id='type-id-892' size-in-bits='64' id='type-id-1249'/>
+    <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-410'/>
+    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-1252'/>
+    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-423'/>
+    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1253'/>
+    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-424'/>
+    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-436'/>
     <reference-type-def kind='lvalue' type-id='type-id-898' size-in-bits='64' id='type-id-1255'/>
-    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-426'/>
-    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-438'/>
-    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-1257'/>
-    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-429'/>
-    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-1258'/>
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-436'/>
-    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-1259'/>
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-427'/>
+    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-1256'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-434'/>
+    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-1257'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-430'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-1259'/>
     <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1261'/>
     <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-1263'/>
-    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-1265'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1266' size-in-bits='64' id='type-id-1267'/>
-    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-1268'/>
-    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-1270'/>
-    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-1271'/>
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-1272'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1273' size-in-bits='64' id='type-id-1274'/>
-    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-1275'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1264' size-in-bits='64' id='type-id-1265'/>
+    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-1266'/>
+    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-1268'/>
+    <reference-type-def kind='lvalue' type-id='type-id-943' size-in-bits='64' id='type-id-1269'/>
+    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-1270'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1271' size-in-bits='64' id='type-id-1272'/>
+    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-1273'/>
+    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-1274'/>
+    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-1275'/>
     <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-1276'/>
     <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-1277'/>
     <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1278'/>
     <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1279'/>
     <reference-type-def kind='lvalue' type-id='type-id-910' size-in-bits='64' id='type-id-1280'/>
     <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-1281'/>
-    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-1282'/>
-    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-1283'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1284' size-in-bits='64' id='type-id-1285'/>
-    <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-1286'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1287' size-in-bits='64' id='type-id-1288'/>
-    <pointer-type-def type-id='type-id-1287' size-in-bits='64' id='type-id-1289'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1282' size-in-bits='64' id='type-id-1283'/>
+    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-1284'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-1286'/>
+    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-1287'/>
+    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-1289'/>
     <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
-    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1293'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1294' size-in-bits='64' id='type-id-1295'/>
-    <pointer-type-def type-id='type-id-1294' size-in-bits='64' id='type-id-1296'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
-    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1299'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1300' size-in-bits='64' id='type-id-1301'/>
-    <pointer-type-def type-id='type-id-1300' size-in-bits='64' id='type-id-1302'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1304'/>
-    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-1305'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1292' size-in-bits='64' id='type-id-1293'/>
+    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1294'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1295' size-in-bits='64' id='type-id-1296'/>
+    <pointer-type-def type-id='type-id-1295' size-in-bits='64' id='type-id-1297'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1298' size-in-bits='64' id='type-id-1299'/>
+    <pointer-type-def type-id='type-id-1298' size-in-bits='64' id='type-id-1300'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1301' size-in-bits='64' id='type-id-1302'/>
+    <pointer-type-def type-id='type-id-1301' size-in-bits='64' id='type-id-1303'/>
+    <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-1305'/>
     <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1307'/>
     <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-1309'/>
     <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-1311'/>
-    <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-1313'/>
-    <pointer-type-def type-id='type-id-1314' size-in-bits='64' id='type-id-548'/>
-    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-559'/>
-    <reference-type-def kind='lvalue' type-id='type-id-938' size-in-bits='64' id='type-id-1316'/>
-    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-543'/>
+    <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-546'/>
+    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-936' size-in-bits='64' id='type-id-1314'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-541'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1315' size-in-bits='64' id='type-id-1316'/>
+    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-540'/>
     <reference-type-def kind='lvalue' type-id='type-id-1317' size-in-bits='64' id='type-id-1318'/>
-    <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-542'/>
     <reference-type-def kind='lvalue' type-id='type-id-1319' size-in-bits='64' id='type-id-1320'/>
     <reference-type-def kind='lvalue' type-id='type-id-1321' size-in-bits='64' id='type-id-1322'/>
     <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-1324'/>
@@ -9370,8 +9364,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-1371' size-in-bits='64' id='type-id-1372'/>
     <reference-type-def kind='lvalue' type-id='type-id-1373' size-in-bits='64' id='type-id-1374'/>
     <reference-type-def kind='lvalue' type-id='type-id-1375' size-in-bits='64' id='type-id-1376'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1377' size-in-bits='64' id='type-id-1378'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-1379'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-1377'/>
+    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-1379'/>
     <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-1381'/>
     <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1383'/>
     <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-1385'/>
@@ -9384,392 +9378,392 @@
     <pointer-type-def type-id='type-id-1398' size-in-bits='64' id='type-id-1399'/>
     <pointer-type-def type-id='type-id-1400' size-in-bits='64' id='type-id-1401'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1402'/>
-    <qualified-type-def type-id='type-id-943' const='yes' id='type-id-1403'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1403' size-in-bits='64' id='type-id-959'/>
-    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1404'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1404' size-in-bits='64' id='type-id-957'/>
-    <qualified-type-def type-id='type-id-998' const='yes' id='type-id-1405'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1403'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1403' size-in-bits='64' id='type-id-957'/>
+    <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1404'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1404' size-in-bits='64' id='type-id-955'/>
+    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-1405'/>
     <pointer-type-def type-id='type-id-1405' size-in-bits='64' id='type-id-1406'/>
-    <qualified-type-def type-id='type-id-1000' const='yes' id='type-id-1407'/>
+    <qualified-type-def type-id='type-id-998' const='yes' id='type-id-1407'/>
     <reference-type-def kind='lvalue' type-id='type-id-1407' size-in-bits='64' id='type-id-1408'/>
     <pointer-type-def type-id='type-id-1407' size-in-bits='64' id='type-id-1409'/>
-    <qualified-type-def type-id='type-id-1002' const='yes' id='type-id-1410'/>
+    <qualified-type-def type-id='type-id-1000' const='yes' id='type-id-1410'/>
     <reference-type-def kind='lvalue' type-id='type-id-1410' size-in-bits='64' id='type-id-1411'/>
     <pointer-type-def type-id='type-id-1410' size-in-bits='64' id='type-id-1412'/>
-    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1413'/>
-    <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-515'/>
-    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1414'/>
-    <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-516'/>
-    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-1415'/>
-    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-517'/>
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1416'/>
+    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-1413'/>
+    <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-513'/>
+    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1414'/>
+    <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-514'/>
+    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1415'/>
+    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-515'/>
+    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-1416'/>
     <reference-type-def kind='lvalue' type-id='type-id-1416' size-in-bits='64' id='type-id-1417'/>
-    <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-522'/>
-    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1418'/>
-    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-514'/>
-    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1419'/>
-    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-461'/>
-    <reference-type-def kind='lvalue' type-id='type-id-772' size-in-bits='64' id='type-id-1420'/>
-    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1421'/>
-    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-472'/>
-    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1422'/>
-    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-501'/>
-    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1423'/>
-    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-519'/>
-    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1424'/>
-    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-481'/>
-    <qualified-type-def type-id='type-id-1025' const='yes' id='type-id-1425'/>
-    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-525'/>
-    <qualified-type-def type-id='type-id-1027' const='yes' id='type-id-1426'/>
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-442'/>
-    <qualified-type-def type-id='type-id-1029' const='yes' id='type-id-1427'/>
-    <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-446'/>
-    <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1428'/>
-    <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-500'/>
-    <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-1429'/>
-    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-499'/>
-    <qualified-type-def type-id='type-id-1035' const='yes' id='type-id-1430'/>
-    <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-504'/>
-    <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1431'/>
-    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-457'/>
-    <qualified-type-def type-id='type-id-1039' const='yes' id='type-id-1432'/>
-    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-445'/>
-    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1433'/>
-    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-490'/>
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1434'/>
-    <pointer-type-def type-id='type-id-1434' size-in-bits='64' id='type-id-489'/>
-    <qualified-type-def type-id='type-id-1043' const='yes' id='type-id-1435'/>
-    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-480'/>
-    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1436'/>
-    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-511'/>
-    <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1437'/>
-    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-509'/>
-    <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1438'/>
-    <pointer-type-def type-id='type-id-1438' size-in-bits='64' id='type-id-510'/>
-    <qualified-type-def type-id='type-id-1051' const='yes' id='type-id-1439'/>
-    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-495'/>
-    <qualified-type-def type-id='type-id-1053' const='yes' id='type-id-1440'/>
-    <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-494'/>
-    <qualified-type-def type-id='type-id-1055' const='yes' id='type-id-1441'/>
-    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-487'/>
-    <qualified-type-def type-id='type-id-1057' const='yes' id='type-id-1442'/>
-    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-485'/>
-    <qualified-type-def type-id='type-id-1059' const='yes' id='type-id-1443'/>
-    <pointer-type-def type-id='type-id-1443' size-in-bits='64' id='type-id-486'/>
-    <qualified-type-def type-id='type-id-1061' const='yes' id='type-id-1444'/>
-    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-440'/>
-    <qualified-type-def type-id='type-id-1063' const='yes' id='type-id-1445'/>
-    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-469'/>
-    <qualified-type-def type-id='type-id-1065' const='yes' id='type-id-1446'/>
-    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-464'/>
-    <qualified-type-def type-id='type-id-1067' const='yes' id='type-id-1447'/>
-    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-460'/>
-    <qualified-type-def type-id='type-id-1069' const='yes' id='type-id-1448'/>
+    <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-520'/>
+    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1418'/>
+    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-512'/>
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1419'/>
+    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-459'/>
+    <reference-type-def kind='lvalue' type-id='type-id-770' size-in-bits='64' id='type-id-1420'/>
+    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1421'/>
+    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-470'/>
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1422'/>
+    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-499'/>
+    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1423'/>
+    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-517'/>
+    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1424'/>
+    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-479'/>
+    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1425'/>
+    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-523'/>
+    <qualified-type-def type-id='type-id-1025' const='yes' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-440'/>
+    <qualified-type-def type-id='type-id-1027' const='yes' id='type-id-1427'/>
+    <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-444'/>
+    <qualified-type-def type-id='type-id-1029' const='yes' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-498'/>
+    <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1429'/>
+    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-497'/>
+    <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-1430'/>
+    <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-502'/>
+    <qualified-type-def type-id='type-id-1035' const='yes' id='type-id-1431'/>
+    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-455'/>
+    <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1432'/>
+    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-443'/>
+    <qualified-type-def type-id='type-id-1039' const='yes' id='type-id-1433'/>
+    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-488'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1434'/>
+    <pointer-type-def type-id='type-id-1434' size-in-bits='64' id='type-id-487'/>
+    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1435'/>
+    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-478'/>
+    <qualified-type-def type-id='type-id-1043' const='yes' id='type-id-1436'/>
+    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-509'/>
+    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1437'/>
+    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-507'/>
+    <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-1438' size-in-bits='64' id='type-id-508'/>
+    <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1439'/>
+    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-493'/>
+    <qualified-type-def type-id='type-id-1051' const='yes' id='type-id-1440'/>
+    <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-492'/>
+    <qualified-type-def type-id='type-id-1053' const='yes' id='type-id-1441'/>
+    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-485'/>
+    <qualified-type-def type-id='type-id-1055' const='yes' id='type-id-1442'/>
+    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-483'/>
+    <qualified-type-def type-id='type-id-1057' const='yes' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-1443' size-in-bits='64' id='type-id-484'/>
+    <qualified-type-def type-id='type-id-1059' const='yes' id='type-id-1444'/>
+    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-438'/>
+    <qualified-type-def type-id='type-id-1061' const='yes' id='type-id-1445'/>
+    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-467'/>
+    <qualified-type-def type-id='type-id-1063' const='yes' id='type-id-1446'/>
+    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-462'/>
+    <qualified-type-def type-id='type-id-1065' const='yes' id='type-id-1447'/>
+    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-458'/>
+    <qualified-type-def type-id='type-id-1067' const='yes' id='type-id-1448'/>
     <reference-type-def kind='lvalue' type-id='type-id-1448' size-in-bits='64' id='type-id-1449'/>
     <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-1450'/>
-    <qualified-type-def type-id='type-id-1072' const='yes' id='type-id-1451'/>
+    <qualified-type-def type-id='type-id-1070' const='yes' id='type-id-1451'/>
     <reference-type-def kind='lvalue' type-id='type-id-1451' size-in-bits='64' id='type-id-1452'/>
     <pointer-type-def type-id='type-id-1451' size-in-bits='64' id='type-id-1453'/>
-    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1454'/>
-    <pointer-type-def type-id='type-id-1454' size-in-bits='64' id='type-id-447'/>
-    <qualified-type-def type-id='type-id-1077' const='yes' id='type-id-1455'/>
-    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-448'/>
-    <qualified-type-def type-id='type-id-1079' const='yes' id='type-id-1456'/>
-    <pointer-type-def type-id='type-id-1456' size-in-bits='64' id='type-id-451'/>
-    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1457'/>
+    <qualified-type-def type-id='type-id-1073' const='yes' id='type-id-1454'/>
+    <pointer-type-def type-id='type-id-1454' size-in-bits='64' id='type-id-445'/>
+    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1455'/>
+    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-446'/>
+    <qualified-type-def type-id='type-id-1077' const='yes' id='type-id-1456'/>
+    <pointer-type-def type-id='type-id-1456' size-in-bits='64' id='type-id-449'/>
+    <qualified-type-def type-id='type-id-1079' const='yes' id='type-id-1457'/>
     <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
-    <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1459'/>
+    <qualified-type-def type-id='type-id-1087' const='yes' id='type-id-1459'/>
     <reference-type-def kind='lvalue' type-id='type-id-1459' size-in-bits='64' id='type-id-1460'/>
     <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-1461'/>
-    <qualified-type-def type-id='type-id-1091' const='yes' id='type-id-1462'/>
+    <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1462'/>
     <reference-type-def kind='lvalue' type-id='type-id-1462' size-in-bits='64' id='type-id-1463'/>
     <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-1464'/>
-    <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1465'/>
+    <qualified-type-def type-id='type-id-1091' const='yes' id='type-id-1465'/>
     <reference-type-def kind='lvalue' type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
     <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-1467'/>
-    <qualified-type-def type-id='type-id-1095' const='yes' id='type-id-1468'/>
+    <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1468'/>
     <reference-type-def kind='lvalue' type-id='type-id-1468' size-in-bits='64' id='type-id-1469'/>
     <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-1470'/>
-    <qualified-type-def type-id='type-id-1098' const='yes' id='type-id-1471'/>
+    <qualified-type-def type-id='type-id-1096' const='yes' id='type-id-1471'/>
     <reference-type-def kind='lvalue' type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
     <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1473'/>
-    <qualified-type-def type-id='type-id-1101' const='yes' id='type-id-1474'/>
+    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1474'/>
     <reference-type-def kind='lvalue' type-id='type-id-1474' size-in-bits='64' id='type-id-1475'/>
     <pointer-type-def type-id='type-id-1474' size-in-bits='64' id='type-id-1476'/>
-    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-1477'/>
-    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-455'/>
-    <qualified-type-def type-id='type-id-1106' const='yes' id='type-id-1478'/>
+    <qualified-type-def type-id='type-id-1102' const='yes' id='type-id-1477'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-453'/>
+    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-1478'/>
     <pointer-type-def type-id='type-id-1478' size-in-bits='64' id='type-id-1479'/>
-    <qualified-type-def type-id='type-id-1108' const='yes' id='type-id-1480'/>
+    <qualified-type-def type-id='type-id-1106' const='yes' id='type-id-1480'/>
     <pointer-type-def type-id='type-id-1480' size-in-bits='64' id='type-id-1481'/>
-    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1482'/>
+    <qualified-type-def type-id='type-id-1114' const='yes' id='type-id-1482'/>
     <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1483'/>
     <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1484'/>
-    <qualified-type-def type-id='type-id-1118' const='yes' id='type-id-1485'/>
+    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1485'/>
     <reference-type-def kind='lvalue' type-id='type-id-1485' size-in-bits='64' id='type-id-1486'/>
     <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1487'/>
-    <qualified-type-def type-id='type-id-1120' const='yes' id='type-id-1488'/>
+    <qualified-type-def type-id='type-id-1118' const='yes' id='type-id-1488'/>
     <reference-type-def kind='lvalue' type-id='type-id-1488' size-in-bits='64' id='type-id-1489'/>
-    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-498'/>
-    <qualified-type-def type-id='type-id-1122' const='yes' id='type-id-1490'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-979'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-496'/>
+    <qualified-type-def type-id='type-id-1120' const='yes' id='type-id-1490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-977'/>
     <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1491'/>
-    <qualified-type-def type-id='type-id-1125' const='yes' id='type-id-1492'/>
+    <qualified-type-def type-id='type-id-1123' const='yes' id='type-id-1492'/>
     <reference-type-def kind='lvalue' type-id='type-id-1492' size-in-bits='64' id='type-id-1493'/>
     <pointer-type-def type-id='type-id-1492' size-in-bits='64' id='type-id-1494'/>
-    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1495'/>
+    <qualified-type-def type-id='type-id-1126' const='yes' id='type-id-1495'/>
     <reference-type-def kind='lvalue' type-id='type-id-1495' size-in-bits='64' id='type-id-1496'/>
     <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1497'/>
-    <qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1498'/>
+    <qualified-type-def type-id='type-id-1129' const='yes' id='type-id-1498'/>
     <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
-    <qualified-type-def type-id='type-id-1133' const='yes' id='type-id-1500'/>
+    <qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1500'/>
     <reference-type-def kind='lvalue' type-id='type-id-1500' size-in-bits='64' id='type-id-1501'/>
     <pointer-type-def type-id='type-id-1500' size-in-bits='64' id='type-id-1502'/>
-    <qualified-type-def type-id='type-id-1135' const='yes' id='type-id-1503'/>
+    <qualified-type-def type-id='type-id-1133' const='yes' id='type-id-1503'/>
     <reference-type-def kind='lvalue' type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
-    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-449'/>
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1505'/>
+    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-447'/>
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-1505'/>
     <reference-type-def kind='lvalue' type-id='type-id-1505' size-in-bits='64' id='type-id-1506'/>
     <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-1507'/>
-    <qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1508'/>
+    <qualified-type-def type-id='type-id-1138' const='yes' id='type-id-1508'/>
     <pointer-type-def type-id='type-id-1508' size-in-bits='64' id='type-id-1509'/>
-    <qualified-type-def type-id='type-id-1142' const='yes' id='type-id-1510'/>
+    <qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1510'/>
     <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-1511'/>
-    <qualified-type-def type-id='type-id-1144' const='yes' id='type-id-1512'/>
-    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-505'/>
+    <qualified-type-def type-id='type-id-1142' const='yes' id='type-id-1512'/>
+    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-503'/>
     <qualified-type-def type-id='type-id-1513' const='yes' id='type-id-1514'/>
     <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-1515'/>
-    <qualified-type-def type-id='type-id-1146' const='yes' id='type-id-1516'/>
+    <qualified-type-def type-id='type-id-1144' const='yes' id='type-id-1516'/>
     <reference-type-def kind='lvalue' type-id='type-id-1516' size-in-bits='64' id='type-id-1517'/>
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-475'/>
-    <qualified-type-def type-id='type-id-1149' const='yes' id='type-id-1518'/>
+    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-473'/>
+    <qualified-type-def type-id='type-id-1147' const='yes' id='type-id-1518'/>
     <reference-type-def kind='lvalue' type-id='type-id-1518' size-in-bits='64' id='type-id-1519'/>
     <pointer-type-def type-id='type-id-1518' size-in-bits='64' id='type-id-1520'/>
-    <qualified-type-def type-id='type-id-1152' const='yes' id='type-id-1521'/>
-    <pointer-type-def type-id='type-id-1521' size-in-bits='64' id='type-id-473'/>
-    <qualified-type-def type-id='type-id-1154' const='yes' id='type-id-1522'/>
+    <qualified-type-def type-id='type-id-1150' const='yes' id='type-id-1521'/>
+    <pointer-type-def type-id='type-id-1521' size-in-bits='64' id='type-id-471'/>
+    <qualified-type-def type-id='type-id-1152' const='yes' id='type-id-1522'/>
     <reference-type-def kind='lvalue' type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
-    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-470'/>
-    <qualified-type-def type-id='type-id-1156' const='yes' id='type-id-1524'/>
-    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-471'/>
-    <qualified-type-def type-id='type-id-1158' const='yes' id='type-id-1525'/>
+    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-468'/>
+    <qualified-type-def type-id='type-id-1154' const='yes' id='type-id-1524'/>
+    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-469'/>
+    <qualified-type-def type-id='type-id-1156' const='yes' id='type-id-1525'/>
     <reference-type-def kind='lvalue' type-id='type-id-1525' size-in-bits='64' id='type-id-1526'/>
     <pointer-type-def type-id='type-id-1525' size-in-bits='64' id='type-id-1527'/>
-    <qualified-type-def type-id='type-id-1160' const='yes' id='type-id-1528'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1528' size-in-bits='64' id='type-id-946'/>
+    <qualified-type-def type-id='type-id-1158' const='yes' id='type-id-1528'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1528' size-in-bits='64' id='type-id-944'/>
     <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-1529'/>
-    <qualified-type-def type-id='type-id-1162' const='yes' id='type-id-1530'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-940'/>
+    <qualified-type-def type-id='type-id-1160' const='yes' id='type-id-1530'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-938'/>
     <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
-    <qualified-type-def type-id='type-id-1164' const='yes' id='type-id-1532'/>
+    <qualified-type-def type-id='type-id-1162' const='yes' id='type-id-1532'/>
     <pointer-type-def type-id='type-id-1532' size-in-bits='64' id='type-id-1533'/>
-    <qualified-type-def type-id='type-id-1166' const='yes' id='type-id-1534'/>
-    <pointer-type-def type-id='type-id-1534' size-in-bits='64' id='type-id-491'/>
-    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-1535'/>
+    <qualified-type-def type-id='type-id-1164' const='yes' id='type-id-1534'/>
+    <pointer-type-def type-id='type-id-1534' size-in-bits='64' id='type-id-489'/>
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1535'/>
     <reference-type-def kind='lvalue' type-id='type-id-1535' size-in-bits='64' id='type-id-1536'/>
     <pointer-type-def type-id='type-id-1535' size-in-bits='64' id='type-id-1537'/>
     <qualified-type-def type-id='type-id-1538' const='yes' id='type-id-1539'/>
     <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
-    <qualified-type-def type-id='type-id-1169' const='yes' id='type-id-1541'/>
+    <qualified-type-def type-id='type-id-1167' const='yes' id='type-id-1541'/>
     <reference-type-def kind='lvalue' type-id='type-id-1541' size-in-bits='64' id='type-id-1542'/>
-    <pointer-type-def type-id='type-id-1541' size-in-bits='64' id='type-id-462'/>
-    <qualified-type-def type-id='type-id-1172' const='yes' id='type-id-1543'/>
+    <pointer-type-def type-id='type-id-1541' size-in-bits='64' id='type-id-460'/>
+    <qualified-type-def type-id='type-id-1170' const='yes' id='type-id-1543'/>
     <reference-type-def kind='lvalue' type-id='type-id-1543' size-in-bits='64' id='type-id-1544'/>
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-1545'/>
-    <qualified-type-def type-id='type-id-1175' const='yes' id='type-id-1546'/>
+    <qualified-type-def type-id='type-id-1173' const='yes' id='type-id-1546'/>
     <reference-type-def kind='lvalue' type-id='type-id-1546' size-in-bits='64' id='type-id-1547'/>
     <pointer-type-def type-id='type-id-1546' size-in-bits='64' id='type-id-1548'/>
-    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1549'/>
+    <qualified-type-def type-id='type-id-1176' const='yes' id='type-id-1549'/>
     <reference-type-def kind='lvalue' type-id='type-id-1549' size-in-bits='64' id='type-id-1550'/>
     <pointer-type-def type-id='type-id-1549' size-in-bits='64' id='type-id-1551'/>
-    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1552'/>
+    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1552'/>
     <reference-type-def kind='lvalue' type-id='type-id-1552' size-in-bits='64' id='type-id-1553'/>
     <pointer-type-def type-id='type-id-1552' size-in-bits='64' id='type-id-1554'/>
-    <qualified-type-def type-id='type-id-1180' const='yes' id='type-id-1555'/>
+    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1555'/>
     <pointer-type-def type-id='type-id-1555' size-in-bits='64' id='type-id-1556'/>
-    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1557'/>
+    <qualified-type-def type-id='type-id-1180' const='yes' id='type-id-1557'/>
     <reference-type-def kind='lvalue' type-id='type-id-1557' size-in-bits='64' id='type-id-1558'/>
     <pointer-type-def type-id='type-id-1557' size-in-bits='64' id='type-id-1559'/>
-    <qualified-type-def type-id='type-id-1183' const='yes' id='type-id-1560'/>
+    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1560'/>
     <reference-type-def kind='lvalue' type-id='type-id-1560' size-in-bits='64' id='type-id-1561'/>
-    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-482'/>
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1562'/>
+    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-480'/>
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-1562'/>
     <reference-type-def kind='lvalue' type-id='type-id-1562' size-in-bits='64' id='type-id-1563'/>
     <pointer-type-def type-id='type-id-1562' size-in-bits='64' id='type-id-1564'/>
-    <qualified-type-def type-id='type-id-1186' const='yes' id='type-id-1565'/>
+    <qualified-type-def type-id='type-id-1184' const='yes' id='type-id-1565'/>
     <reference-type-def kind='lvalue' type-id='type-id-1565' size-in-bits='64' id='type-id-1566'/>
     <pointer-type-def type-id='type-id-1565' size-in-bits='64' id='type-id-1567'/>
-    <qualified-type-def type-id='type-id-1189' const='yes' id='type-id-1568'/>
+    <qualified-type-def type-id='type-id-1187' const='yes' id='type-id-1568'/>
     <pointer-type-def type-id='type-id-1568' size-in-bits='64' id='type-id-1569'/>
-    <qualified-type-def type-id='type-id-1191' const='yes' id='type-id-1570'/>
+    <qualified-type-def type-id='type-id-1189' const='yes' id='type-id-1570'/>
     <reference-type-def kind='lvalue' type-id='type-id-1570' size-in-bits='64' id='type-id-1571'/>
-    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-524'/>
-    <qualified-type-def type-id='type-id-1193' const='yes' id='type-id-1572'/>
+    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-522'/>
+    <qualified-type-def type-id='type-id-1191' const='yes' id='type-id-1572'/>
     <reference-type-def kind='lvalue' type-id='type-id-1572' size-in-bits='64' id='type-id-1573'/>
     <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-1574'/>
-    <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-1575'/>
+    <qualified-type-def type-id='type-id-1194' const='yes' id='type-id-1575'/>
     <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-1576'/>
-    <qualified-type-def type-id='type-id-1198' const='yes' id='type-id-1577'/>
+    <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-1577'/>
     <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
-    <qualified-type-def type-id='type-id-1200' const='yes' id='type-id-1579'/>
+    <qualified-type-def type-id='type-id-1198' const='yes' id='type-id-1579'/>
     <reference-type-def kind='lvalue' type-id='type-id-1579' size-in-bits='64' id='type-id-1580'/>
-    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-527'/>
-    <qualified-type-def type-id='type-id-1202' const='yes' id='type-id-1581'/>
+    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-525'/>
+    <qualified-type-def type-id='type-id-1200' const='yes' id='type-id-1581'/>
     <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-1582'/>
-    <qualified-type-def type-id='type-id-1204' const='yes' id='type-id-1583'/>
+    <qualified-type-def type-id='type-id-1202' const='yes' id='type-id-1583'/>
     <reference-type-def kind='lvalue' type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
-    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-528'/>
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1585'/>
+    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-526'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1585'/>
     <reference-type-def kind='lvalue' type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
-    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-520'/>
-    <qualified-type-def type-id='type-id-1208' const='yes' id='type-id-1587'/>
+    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-518'/>
+    <qualified-type-def type-id='type-id-1206' const='yes' id='type-id-1587'/>
     <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
-    <qualified-type-def type-id='type-id-1210' const='yes' id='type-id-1589'/>
+    <qualified-type-def type-id='type-id-1208' const='yes' id='type-id-1589'/>
     <reference-type-def kind='lvalue' type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
     <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-1591'/>
-    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1592'/>
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1592'/>
     <reference-type-def kind='lvalue' type-id='type-id-1592' size-in-bits='64' id='type-id-1593'/>
     <pointer-type-def type-id='type-id-1592' size-in-bits='64' id='type-id-1594'/>
-    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1595'/>
+    <qualified-type-def type-id='type-id-1211' const='yes' id='type-id-1595'/>
     <reference-type-def kind='lvalue' type-id='type-id-1595' size-in-bits='64' id='type-id-1596'/>
     <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-1597'/>
-    <qualified-type-def type-id='type-id-1216' const='yes' id='type-id-1598'/>
+    <qualified-type-def type-id='type-id-1214' const='yes' id='type-id-1598'/>
     <reference-type-def kind='lvalue' type-id='type-id-1598' size-in-bits='64' id='type-id-1599'/>
     <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-1600'/>
-    <qualified-type-def type-id='type-id-1219' const='yes' id='type-id-1601'/>
+    <qualified-type-def type-id='type-id-1217' const='yes' id='type-id-1601'/>
     <reference-type-def kind='lvalue' type-id='type-id-1601' size-in-bits='64' id='type-id-1602'/>
     <pointer-type-def type-id='type-id-1601' size-in-bits='64' id='type-id-1603'/>
-    <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1604'/>
+    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1604'/>
     <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
     <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1606'/>
-    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1607'/>
-    <pointer-type-def type-id='type-id-1607' size-in-bits='64' id='type-id-518'/>
-    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1608'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1607'/>
+    <pointer-type-def type-id='type-id-1607' size-in-bits='64' id='type-id-516'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1608'/>
     <reference-type-def kind='lvalue' type-id='type-id-1608' size-in-bits='64' id='type-id-1609'/>
-    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-523'/>
-    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1610'/>
+    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-521'/>
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1610'/>
     <reference-type-def kind='lvalue' type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
-    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-443'/>
-    <qualified-type-def type-id='type-id-1227' const='yes' id='type-id-1612'/>
-    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-444'/>
-    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1613'/>
+    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-441'/>
+    <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1612'/>
+    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-442'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1613'/>
     <reference-type-def kind='lvalue' type-id='type-id-1613' size-in-bits='64' id='type-id-1614'/>
-    <pointer-type-def type-id='type-id-1613' size-in-bits='64' id='type-id-452'/>
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1615'/>
+    <pointer-type-def type-id='type-id-1613' size-in-bits='64' id='type-id-450'/>
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1615'/>
     <reference-type-def kind='lvalue' type-id='type-id-1615' size-in-bits='64' id='type-id-1616'/>
-    <pointer-type-def type-id='type-id-1615' size-in-bits='64' id='type-id-502'/>
-    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1617'/>
+    <pointer-type-def type-id='type-id-1615' size-in-bits='64' id='type-id-500'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1617'/>
     <reference-type-def kind='lvalue' type-id='type-id-1617' size-in-bits='64' id='type-id-1618'/>
-    <pointer-type-def type-id='type-id-1617' size-in-bits='64' id='type-id-503'/>
-    <qualified-type-def type-id='type-id-1231' const='yes' id='type-id-1619'/>
-    <pointer-type-def type-id='type-id-1619' size-in-bits='64' id='type-id-456'/>
-    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1620'/>
+    <pointer-type-def type-id='type-id-1617' size-in-bits='64' id='type-id-501'/>
+    <qualified-type-def type-id='type-id-1229' const='yes' id='type-id-1619'/>
+    <pointer-type-def type-id='type-id-1619' size-in-bits='64' id='type-id-454'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1620'/>
     <reference-type-def kind='lvalue' type-id='type-id-1620' size-in-bits='64' id='type-id-1621'/>
-    <pointer-type-def type-id='type-id-1620' size-in-bits='64' id='type-id-441'/>
-    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1622'/>
+    <pointer-type-def type-id='type-id-1620' size-in-bits='64' id='type-id-439'/>
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1622'/>
     <reference-type-def kind='lvalue' type-id='type-id-1622' size-in-bits='64' id='type-id-1623'/>
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-458'/>
-    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1624'/>
+    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-456'/>
+    <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1624'/>
     <reference-type-def kind='lvalue' type-id='type-id-1624' size-in-bits='64' id='type-id-1625'/>
-    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-450'/>
-    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1626'/>
-    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-477'/>
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1627'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1627' size-in-bits='64' id='type-id-476'/>
-    <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-474'/>
-    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1628'/>
-    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-463'/>
-    <qualified-type-def type-id='type-id-1239' const='yes' id='type-id-1629'/>
-    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-454'/>
-    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1630'/>
+    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-448'/>
+    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1626'/>
+    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-475'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1627'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1627' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-472'/>
+    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1628'/>
+    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-461'/>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1629'/>
+    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-452'/>
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1630'/>
     <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-1631'/>
-    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-453'/>
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1632'/>
+    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-451'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1632'/>
     <reference-type-def kind='lvalue' type-id='type-id-1632' size-in-bits='64' id='type-id-1633'/>
-    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-492'/>
-    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1634'/>
+    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-490'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1634'/>
     <reference-type-def kind='lvalue' type-id='type-id-1634' size-in-bits='64' id='type-id-1635'/>
-    <pointer-type-def type-id='type-id-1634' size-in-bits='64' id='type-id-493'/>
-    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1636'/>
+    <pointer-type-def type-id='type-id-1634' size-in-bits='64' id='type-id-491'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1636'/>
     <reference-type-def kind='lvalue' type-id='type-id-1636' size-in-bits='64' id='type-id-1637'/>
-    <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-483'/>
-    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1638'/>
-    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-521'/>
-    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1639'/>
-    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-459'/>
-    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1640'/>
-    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-526'/>
-    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1641'/>
-    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-484'/>
-    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1642'/>
-    <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-535'/>
-    <qualified-type-def type-id='type-id-1248' const='yes' id='type-id-1643'/>
-    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-508'/>
-    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1644'/>
+    <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-481'/>
+    <qualified-type-def type-id='type-id-1242' const='yes' id='type-id-1638'/>
+    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-519'/>
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1639'/>
+    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-457'/>
+    <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1640'/>
+    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-524'/>
+    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1641'/>
+    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-482'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1642'/>
+    <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-533'/>
+    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1643'/>
+    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-506'/>
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1644'/>
     <reference-type-def kind='lvalue' type-id='type-id-1644' size-in-bits='64' id='type-id-1645'/>
-    <pointer-type-def type-id='type-id-1644' size-in-bits='64' id='type-id-513'/>
-    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1646'/>
+    <pointer-type-def type-id='type-id-1644' size-in-bits='64' id='type-id-511'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1646'/>
     <reference-type-def kind='lvalue' type-id='type-id-1646' size-in-bits='64' id='type-id-1647'/>
-    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-534'/>
-    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1648'/>
+    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-532'/>
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1648'/>
     <reference-type-def kind='lvalue' type-id='type-id-1648' size-in-bits='64' id='type-id-1649'/>
-    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-533'/>
-    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1650'/>
-    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-479'/>
-    <qualified-type-def type-id='type-id-1253' const='yes' id='type-id-1651'/>
-    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-468'/>
-    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1652'/>
+    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-531'/>
+    <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-1650'/>
+    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-477'/>
+    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1651'/>
+    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-466'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1652'/>
     <reference-type-def kind='lvalue' type-id='type-id-1652' size-in-bits='64' id='type-id-1653'/>
-    <pointer-type-def type-id='type-id-1652' size-in-bits='64' id='type-id-496'/>
-    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1654'/>
+    <pointer-type-def type-id='type-id-1652' size-in-bits='64' id='type-id-494'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1654'/>
     <reference-type-def kind='lvalue' type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
-    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-497'/>
-    <qualified-type-def type-id='type-id-1256' const='yes' id='type-id-1656'/>
-    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-466'/>
-    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1657'/>
+    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-495'/>
+    <qualified-type-def type-id='type-id-1254' const='yes' id='type-id-1656'/>
+    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-464'/>
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1657'/>
     <reference-type-def kind='lvalue' type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
-    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-488'/>
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1659'/>
+    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-486'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1659'/>
     <reference-type-def kind='lvalue' type-id='type-id-1659' size-in-bits='64' id='type-id-1660'/>
-    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-507'/>
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1661'/>
+    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-505'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1661'/>
     <reference-type-def kind='lvalue' type-id='type-id-1661' size-in-bits='64' id='type-id-1662'/>
-    <pointer-type-def type-id='type-id-1661' size-in-bits='64' id='type-id-506'/>
-    <qualified-type-def type-id='type-id-1260' const='yes' id='type-id-1663'/>
+    <pointer-type-def type-id='type-id-1661' size-in-bits='64' id='type-id-504'/>
+    <qualified-type-def type-id='type-id-1258' const='yes' id='type-id-1663'/>
     <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1664'/>
-    <qualified-type-def type-id='type-id-1262' const='yes' id='type-id-1665'/>
+    <qualified-type-def type-id='type-id-1260' const='yes' id='type-id-1665'/>
     <reference-type-def kind='lvalue' type-id='type-id-1665' size-in-bits='64' id='type-id-1666'/>
-    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-531'/>
-    <qualified-type-def type-id='type-id-1264' const='yes' id='type-id-1667'/>
+    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-529'/>
+    <qualified-type-def type-id='type-id-1262' const='yes' id='type-id-1667'/>
     <reference-type-def kind='lvalue' type-id='type-id-1667' size-in-bits='64' id='type-id-1668'/>
-    <pointer-type-def type-id='type-id-1667' size-in-bits='64' id='type-id-532'/>
-    <qualified-type-def type-id='type-id-1266' const='yes' id='type-id-1669'/>
+    <pointer-type-def type-id='type-id-1667' size-in-bits='64' id='type-id-530'/>
+    <qualified-type-def type-id='type-id-1264' const='yes' id='type-id-1669'/>
     <reference-type-def kind='lvalue' type-id='type-id-1669' size-in-bits='64' id='type-id-1670'/>
-    <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-512'/>
-    <qualified-type-def type-id='type-id-1269' const='yes' id='type-id-1671'/>
+    <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-510'/>
+    <qualified-type-def type-id='type-id-1267' const='yes' id='type-id-1671'/>
     <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-1672'/>
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-1673'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1673' size-in-bits='64' id='type-id-934'/>
+    <qualified-type-def type-id='type-id-943' const='yes' id='type-id-1673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1673' size-in-bits='64' id='type-id-932'/>
     <pointer-type-def type-id='type-id-1673' size-in-bits='64' id='type-id-1674'/>
-    <qualified-type-def type-id='type-id-1273' const='yes' id='type-id-1675'/>
+    <qualified-type-def type-id='type-id-1271' const='yes' id='type-id-1675'/>
     <reference-type-def kind='lvalue' type-id='type-id-1675' size-in-bits='64' id='type-id-1676'/>
     <pointer-type-def type-id='type-id-1675' size-in-bits='64' id='type-id-1677'/>
-    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1678'/>
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1678'/>
     <reference-type-def kind='lvalue' type-id='type-id-1678' size-in-bits='64' id='type-id-1679'/>
     <pointer-type-def type-id='type-id-1678' size-in-bits='64' id='type-id-1680'/>
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1681'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1681'/>
     <reference-type-def kind='lvalue' type-id='type-id-1681' size-in-bits='64' id='type-id-1682'/>
-    <pointer-type-def type-id='type-id-1681' size-in-bits='64' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-1681' size-in-bits='64' id='type-id-476'/>
     <qualified-type-def type-id='type-id-1683' const='yes' id='type-id-1684'/>
     <pointer-type-def type-id='type-id-1684' size-in-bits='64' id='type-id-1685'/>
-    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1686'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1686'/>
     <reference-type-def kind='lvalue' type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
-    <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-463'/>
     <qualified-type-def type-id='type-id-1688' const='yes' id='type-id-1689'/>
     <pointer-type-def type-id='type-id-1689' size-in-bits='64' id='type-id-1690'/>
-    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1691'/>
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1691'/>
     <reference-type-def kind='lvalue' type-id='type-id-1691' size-in-bits='64' id='type-id-1692'/>
-    <pointer-type-def type-id='type-id-1691' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-1691' size-in-bits='64' id='type-id-465'/>
     <qualified-type-def type-id='type-id-1693' const='yes' id='type-id-1694'/>
     <pointer-type-def type-id='type-id-1694' size-in-bits='64' id='type-id-1695'/>
     <qualified-type-def type-id='type-id-1696' const='yes' id='type-id-1697'/>
@@ -9778,45 +9772,45 @@
     <pointer-type-def type-id='type-id-1700' size-in-bits='64' id='type-id-1701'/>
     <qualified-type-def type-id='type-id-1702' const='yes' id='type-id-1703'/>
     <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
-    <qualified-type-def type-id='type-id-1284' const='yes' id='type-id-1705'/>
+    <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1705'/>
     <reference-type-def kind='lvalue' type-id='type-id-1705' size-in-bits='64' id='type-id-1706'/>
     <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1707'/>
-    <qualified-type-def type-id='type-id-1287' const='yes' id='type-id-1708'/>
+    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1708'/>
     <reference-type-def kind='lvalue' type-id='type-id-1708' size-in-bits='64' id='type-id-1709'/>
     <pointer-type-def type-id='type-id-1708' size-in-bits='64' id='type-id-1710'/>
-    <qualified-type-def type-id='type-id-1290' const='yes' id='type-id-1711'/>
+    <qualified-type-def type-id='type-id-1288' const='yes' id='type-id-1711'/>
     <pointer-type-def type-id='type-id-1711' size-in-bits='64' id='type-id-1712'/>
-    <qualified-type-def type-id='type-id-1292' const='yes' id='type-id-1713'/>
+    <qualified-type-def type-id='type-id-1290' const='yes' id='type-id-1713'/>
     <reference-type-def kind='lvalue' type-id='type-id-1713' size-in-bits='64' id='type-id-1714'/>
     <pointer-type-def type-id='type-id-1713' size-in-bits='64' id='type-id-1715'/>
-    <qualified-type-def type-id='type-id-1294' const='yes' id='type-id-1716'/>
+    <qualified-type-def type-id='type-id-1292' const='yes' id='type-id-1716'/>
     <reference-type-def kind='lvalue' type-id='type-id-1716' size-in-bits='64' id='type-id-1717'/>
     <pointer-type-def type-id='type-id-1716' size-in-bits='64' id='type-id-1718'/>
-    <qualified-type-def type-id='type-id-1297' const='yes' id='type-id-1719'/>
+    <qualified-type-def type-id='type-id-1295' const='yes' id='type-id-1719'/>
     <reference-type-def kind='lvalue' type-id='type-id-1719' size-in-bits='64' id='type-id-1720'/>
     <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-1721'/>
-    <qualified-type-def type-id='type-id-575' const='yes' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1722'/>
     <reference-type-def kind='lvalue' type-id='type-id-1722' size-in-bits='64' id='type-id-1723'/>
-    <qualified-type-def type-id='type-id-1300' const='yes' id='type-id-1724'/>
+    <qualified-type-def type-id='type-id-1298' const='yes' id='type-id-1724'/>
     <reference-type-def kind='lvalue' type-id='type-id-1724' size-in-bits='64' id='type-id-1725'/>
     <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-1726'/>
-    <qualified-type-def type-id='type-id-1303' const='yes' id='type-id-1727'/>
+    <qualified-type-def type-id='type-id-1301' const='yes' id='type-id-1727'/>
     <reference-type-def kind='lvalue' type-id='type-id-1727' size-in-bits='64' id='type-id-1728'/>
     <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1729'/>
-    <qualified-type-def type-id='type-id-1306' const='yes' id='type-id-1730'/>
+    <qualified-type-def type-id='type-id-1304' const='yes' id='type-id-1730'/>
     <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-1731'/>
-    <qualified-type-def type-id='type-id-1308' const='yes' id='type-id-1732'/>
+    <qualified-type-def type-id='type-id-1306' const='yes' id='type-id-1732'/>
     <reference-type-def kind='lvalue' type-id='type-id-1732' size-in-bits='64' id='type-id-1733'/>
-    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-529'/>
-    <qualified-type-def type-id='type-id-1310' const='yes' id='type-id-1734'/>
+    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-527'/>
+    <qualified-type-def type-id='type-id-1308' const='yes' id='type-id-1734'/>
     <reference-type-def kind='lvalue' type-id='type-id-1734' size-in-bits='64' id='type-id-1735'/>
-    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-530'/>
-    <qualified-type-def type-id='type-id-1312' const='yes' id='type-id-1736'/>
+    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-528'/>
+    <qualified-type-def type-id='type-id-1310' const='yes' id='type-id-1736'/>
     <pointer-type-def type-id='type-id-1736' size-in-bits='64' id='type-id-1737'/>
-    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1738'/>
+    <qualified-type-def type-id='type-id-1312' const='yes' id='type-id-1738'/>
     <reference-type-def kind='lvalue' type-id='type-id-1738' size-in-bits='64' id='type-id-1739'/>
     <pointer-type-def type-id='type-id-1738' size-in-bits='64' id='type-id-1740'/>
-    <qualified-type-def type-id='type-id-1315' const='yes' id='type-id-1741'/>
+    <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1741'/>
     <reference-type-def kind='lvalue' type-id='type-id-1741' size-in-bits='64' id='type-id-1742'/>
     <pointer-type-def type-id='type-id-1741' size-in-bits='64' id='type-id-1743'/>
     <qualified-type-def type-id='type-id-1744' const='yes' id='type-id-1745'/>
@@ -9827,106 +9821,105 @@
     <pointer-type-def type-id='type-id-1751' size-in-bits='64' id='type-id-1752'/>
     <qualified-type-def type-id='type-id-1753' const='yes' id='type-id-1754'/>
     <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1755'/>
-    <qualified-type-def type-id='type-id-938' const='yes' id='type-id-1756'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1756' size-in-bits='64' id='type-id-933'/>
+    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1756'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1756' size-in-bits='64' id='type-id-931'/>
     <pointer-type-def type-id='type-id-1756' size-in-bits='64' id='type-id-1757'/>
-    <qualified-type-def type-id='type-id-1317' const='yes' id='type-id-1758'/>
+    <qualified-type-def type-id='type-id-1315' const='yes' id='type-id-1758'/>
     <reference-type-def kind='lvalue' type-id='type-id-1758' size-in-bits='64' id='type-id-1759'/>
     <pointer-type-def type-id='type-id-1758' size-in-bits='64' id='type-id-1760'/>
-    <reference-type-def kind='lvalue' type-id='type-id-322' size-in-bits='64' id='type-id-1761'/>
-    <qualified-type-def type-id='type-id-373' const='yes' id='type-id-1762'/>
+    <reference-type-def kind='lvalue' type-id='type-id-320' size-in-bits='64' id='type-id-1761'/>
+    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-1762'/>
     <reference-type-def kind='lvalue' type-id='type-id-1762' size-in-bits='64' id='type-id-1763'/>
     <pointer-type-def type-id='type-id-1762' size-in-bits='64' id='type-id-1764'/>
-    <qualified-type-def type-id='type-id-914' const='yes' id='type-id-1765'/>
+    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1765'/>
     <pointer-type-def type-id='type-id-1765' size-in-bits='64' id='type-id-1766'/>
-    <qualified-type-def type-id='type-id-1380' const='yes' id='type-id-1767'/>
+    <qualified-type-def type-id='type-id-1378' const='yes' id='type-id-1767'/>
     <pointer-type-def type-id='type-id-1767' size-in-bits='64' id='type-id-1768'/>
-    <qualified-type-def type-id='type-id-1382' const='yes' id='type-id-1769'/>
+    <qualified-type-def type-id='type-id-1380' const='yes' id='type-id-1769'/>
     <pointer-type-def type-id='type-id-1769' size-in-bits='64' id='type-id-1770'/>
-    <qualified-type-def type-id='type-id-1384' const='yes' id='type-id-1771'/>
+    <qualified-type-def type-id='type-id-1382' const='yes' id='type-id-1771'/>
     <pointer-type-def type-id='type-id-1771' size-in-bits='64' id='type-id-1772'/>
-    <qualified-type-def type-id='type-id-1386' const='yes' id='type-id-1773'/>
+    <qualified-type-def type-id='type-id-1384' const='yes' id='type-id-1773'/>
     <pointer-type-def type-id='type-id-1773' size-in-bits='64' id='type-id-1774'/>
-    <qualified-type-def type-id='type-id-1388' const='yes' id='type-id-1775'/>
+    <qualified-type-def type-id='type-id-1386' const='yes' id='type-id-1775'/>
     <pointer-type-def type-id='type-id-1775' size-in-bits='64' id='type-id-1776'/>
-    <qualified-type-def type-id='type-id-1390' const='yes' id='type-id-1777'/>
+    <qualified-type-def type-id='type-id-1388' const='yes' id='type-id-1777'/>
     <pointer-type-def type-id='type-id-1777' size-in-bits='64' id='type-id-1778'/>
-    <qualified-type-def type-id='type-id-1392' const='yes' id='type-id-1779'/>
+    <qualified-type-def type-id='type-id-1390' const='yes' id='type-id-1779'/>
     <pointer-type-def type-id='type-id-1779' size-in-bits='64' id='type-id-1780'/>
-    <qualified-type-def type-id='type-id-1396' const='yes' id='type-id-1781'/>
+    <qualified-type-def type-id='type-id-1394' const='yes' id='type-id-1781'/>
     <pointer-type-def type-id='type-id-1781' size-in-bits='64' id='type-id-1782'/>
-    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1783'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1783' size-in-bits='64' id='type-id-982'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-939'/>
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-1784'/>
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1785'/>
-    <pointer-type-def type-id='type-id-1785' size-in-bits='64' id='type-id-941'/>
-    <qualified-type-def type-id='type-id-949' const='yes' id='type-id-1786'/>
-    <pointer-type-def type-id='type-id-1786' size-in-bits='64' id='type-id-956'/>
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-1787'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1787' size-in-bits='64' id='type-id-1788'/>
-    <pointer-type-def type-id='type-id-1787' size-in-bits='64' id='type-id-950'/>
-    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-1789'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1789' size-in-bits='64' id='type-id-970'/>
-    <pointer-type-def type-id='type-id-1789' size-in-bits='64' id='type-id-951'/>
-    <pointer-type-def type-id='type-id-951' size-in-bits='64' id='type-id-961'/>
-    <qualified-type-def type-id='type-id-922' const='yes' id='type-id-1790'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1790' size-in-bits='64' id='type-id-975'/>
-    <qualified-type-def type-id='type-id-1791' const='yes' id='type-id-1792'/>
-    <pointer-type-def type-id='type-id-1792' size-in-bits='64' id='type-id-958'/>
-    <qualified-type-def type-id='type-id-954' const='yes' id='type-id-1793'/>
-    <pointer-type-def type-id='type-id-1793' size-in-bits='64' id='type-id-966'/>
-    <qualified-type-def type-id='type-id-924' const='yes' id='type-id-1794'/>
-    <pointer-type-def type-id='type-id-1794' size-in-bits='64' id='type-id-969'/>
-    <qualified-type-def type-id='type-id-926' const='yes' id='type-id-1795'/>
-    <pointer-type-def type-id='type-id-1795' size-in-bits='64' id='type-id-974'/>
-    <qualified-type-def type-id='type-id-992' const='yes' id='type-id-1796'/>
-    <pointer-type-def type-id='type-id-1796' size-in-bits='64' id='type-id-993'/>
-    <qualified-type-def type-id='type-id-995' const='yes' id='type-id-1797'/>
-    <pointer-type-def type-id='type-id-1797' size-in-bits='64' id='type-id-997'/>
-    <qualified-type-def type-id='type-id-983' const='yes' id='type-id-1798'/>
-    <pointer-type-def type-id='type-id-1798' size-in-bits='64' id='type-id-984'/>
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-1799'/>
-    <pointer-type-def type-id='type-id-1799' size-in-bits='64' id='type-id-987'/>
-    <qualified-type-def type-id='type-id-989' const='yes' id='type-id-1800'/>
-    <pointer-type-def type-id='type-id-1800' size-in-bits='64' id='type-id-990'/>
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1801'/>
-    <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-1802'/>
-    <reference-type-def kind='lvalue' type-id='type-id-343' size-in-bits='64' id='type-id-1803'/>
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-1804'/>
-    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-932'/>
-    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-955'/>
-    <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-965'/>
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-963'/>
-    <reference-type-def kind='lvalue' type-id='type-id-919' size-in-bits='64' id='type-id-972'/>
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-968'/>
-    <reference-type-def kind='lvalue' type-id='type-id-922' size-in-bits='64' id='type-id-1805'/>
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-973'/>
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-964'/>
-    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-971'/>
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-976'/>
-    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-994'/>
-    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-996'/>
-    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-985'/>
-    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-988'/>
-    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-991'/>
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-1806'/>
-    <pointer-type-def type-id='type-id-1807' size-in-bits='64' id='type-id-1808'/>
-    <pointer-type-def type-id='type-id-1809' size-in-bits='64' id='type-id-1810'/>
-    <pointer-type-def type-id='type-id-1811' size-in-bits='64' id='type-id-1812'/>
-    <pointer-type-def type-id='type-id-1813' size-in-bits='64' id='type-id-953'/>
-    <pointer-type-def type-id='type-id-1814' size-in-bits='64' id='type-id-1815'/>
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1791'>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1783'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1783' size-in-bits='64' id='type-id-980'/>
+    <pointer-type-def type-id='type-id-1784' size-in-bits='64' id='type-id-1785'/>
+    <pointer-type-def type-id='type-id-1786' size-in-bits='64' id='type-id-1787'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-937'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-1788'/>
+    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-1789'/>
+    <pointer-type-def type-id='type-id-1789' size-in-bits='64' id='type-id-939'/>
+    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1790'/>
+    <pointer-type-def type-id='type-id-1790' size-in-bits='64' id='type-id-954'/>
+    <qualified-type-def type-id='type-id-915' const='yes' id='type-id-1791'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1791' size-in-bits='64' id='type-id-1792'/>
+    <pointer-type-def type-id='type-id-1791' size-in-bits='64' id='type-id-948'/>
+    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-1793'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1793' size-in-bits='64' id='type-id-968'/>
+    <pointer-type-def type-id='type-id-1793' size-in-bits='64' id='type-id-949'/>
+    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-959'/>
+    <qualified-type-def type-id='type-id-920' const='yes' id='type-id-1794'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1794' size-in-bits='64' id='type-id-973'/>
+    <qualified-type-def type-id='type-id-1795' const='yes' id='type-id-1796'/>
+    <pointer-type-def type-id='type-id-1796' size-in-bits='64' id='type-id-956'/>
+    <qualified-type-def type-id='type-id-952' const='yes' id='type-id-1797'/>
+    <pointer-type-def type-id='type-id-1797' size-in-bits='64' id='type-id-964'/>
+    <qualified-type-def type-id='type-id-922' const='yes' id='type-id-1798'/>
+    <pointer-type-def type-id='type-id-1798' size-in-bits='64' id='type-id-967'/>
+    <qualified-type-def type-id='type-id-924' const='yes' id='type-id-1799'/>
+    <pointer-type-def type-id='type-id-1799' size-in-bits='64' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-1800'/>
+    <pointer-type-def type-id='type-id-1800' size-in-bits='64' id='type-id-991'/>
+    <qualified-type-def type-id='type-id-993' const='yes' id='type-id-1801'/>
+    <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-995'/>
+    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1802'/>
+    <pointer-type-def type-id='type-id-1802' size-in-bits='64' id='type-id-982'/>
+    <qualified-type-def type-id='type-id-984' const='yes' id='type-id-1803'/>
+    <pointer-type-def type-id='type-id-1803' size-in-bits='64' id='type-id-985'/>
+    <qualified-type-def type-id='type-id-987' const='yes' id='type-id-1804'/>
+    <pointer-type-def type-id='type-id-1804' size-in-bits='64' id='type-id-988'/>
+    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-1805'/>
+    <pointer-type-def type-id='type-id-1805' size-in-bits='64' id='type-id-1806'/>
+    <reference-type-def kind='lvalue' type-id='type-id-341' size-in-bits='64' id='type-id-1807'/>
+    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-1808'/>
+    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
+    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-953'/>
+    <reference-type-def kind='lvalue' type-id='type-id-915' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-961'/>
+    <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-970'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-966'/>
+    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-1809'/>
+    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-971'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-962'/>
+    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-969'/>
+    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-974'/>
+    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-992'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-994'/>
+    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-983'/>
+    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-986'/>
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-1810'/>
+    <pointer-type-def type-id='type-id-1811' size-in-bits='64' id='type-id-951'/>
+    <pointer-type-def type-id='type-id-1812' size-in-bits='64' id='type-id-1813'/>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1795'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='props' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='shaper' type-id='type-id-1816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
+        <var-decl name='shaper' type-id='type-id-1814' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='map' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='41' column='1'/>
+        <var-decl name='map' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
         <var-decl name='data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='42' column='1'/>
@@ -9957,15 +9950,15 @@
       </data-member>
       <member-function access='public'>
         <function-decl name='collect_lookups' mangled-name='_ZNK18hb_ot_shape_plan_t15collect_lookupsEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-958' is-artificial='yes'/>
-          <parameter type-id='type-id-187'/>
-          <parameter type-id='type-id-960'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-185'/>
+          <parameter type-id='type-id-958'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='substitute' mangled-name='_ZNK18hb_ot_shape_plan_t10substituteEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-145'/>
           <return type-id='type-id-23'/>
@@ -9973,7 +9966,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='position' mangled-name='_ZNK18hb_ot_shape_plan_t8positionEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-145'/>
           <return type-id='type-id-23'/>
@@ -9981,17 +9974,17 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN18hb_ot_shape_plan_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1817' is-artificial='yes'/>
+          <parameter type-id='type-id-1815' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1818'/>
-      <class-decl name='BEInt&lt;short int, 2&gt;' is-struct='yes' visibility='default' id='type-id-1819'/>
-      <class-decl name='IntType&lt;unsigned int, 3u&gt;' is-struct='yes' visibility='default' id='type-id-1820'/>
-      <class-decl name='Tag' is-struct='yes' visibility='default' id='type-id-1821'/>
-      <class-decl name='Sanitizer&lt;OT::GDEF&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1822'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1816'/>
+      <class-decl name='BEInt&lt;short int, 2&gt;' is-struct='yes' visibility='default' id='type-id-1817'/>
+      <class-decl name='IntType&lt;unsigned int, 3u&gt;' is-struct='yes' visibility='default' id='type-id-1818'/>
+      <class-decl name='Tag' is-struct='yes' visibility='default' id='type-id-1819'/>
+      <class-decl name='Sanitizer&lt;OT::GDEF&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1820'>
         <member-function access='public' static='yes'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4GDEFEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
@@ -10005,7 +9998,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Sanitizer&lt;OT::GPOS&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1823'>
+      <class-decl name='Sanitizer&lt;OT::GPOS&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1821'>
         <member-function access='public' static='yes'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4GPOSEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
@@ -10019,7 +10012,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Sanitizer&lt;OT::GSUB&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1824'>
+      <class-decl name='Sanitizer&lt;OT::GSUB&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='292' column='1' id='type-id-1822'>
         <member-function access='public' static='yes'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SanitizerINS_4GSUBEE8sanitizeEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-57'/>
@@ -10033,14 +10026,14 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Index' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='675' column='1' id='type-id-855'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-832'/>
+      <class-decl name='Index' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='675' column='1' id='type-id-853'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-830'/>
         <data-member access='public' static='yes'>
           <var-decl name='NOT_FOUND_INDEX' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='676' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-862'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-832'/>
+      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-860'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-830'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
@@ -10054,8 +10047,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-864'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-862'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10064,29 +10057,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6AnchorENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-518' is-artificial='yes'/>
+            <parameter type-id='type-id-516' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1411'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_6AnchorENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-416' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-414' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_6AnchorENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-416' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-414' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-866'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-864'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10095,30 +10088,30 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-523' is-artificial='yes'/>
+            <parameter type-id='type-id-521' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1417'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-418' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-416' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' mangled-name='_ZN2OT8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEE8sanitizeIjEEbPNS_21hb_sanitize_context_tEPvT_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-418' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-416' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-868'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-866'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10127,29 +10120,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7ArrayOfINS_7IntTypeItLj2EEES3_EES3_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-443' is-artificial='yes'/>
+            <parameter type-id='type-id-441' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1420'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7ArrayOfINS_7IntTypeItLj2EEES3_EES3_E6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-421' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-419' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_7ArrayOfINS_7IntTypeItLj2EEES3_EES3_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-421' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-419' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1227'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1225'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10158,29 +10151,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_10AttachListENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-444' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1449'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_10AttachListENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-409' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-407' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_10AttachListENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-409' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-407' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-870'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-868'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10189,29 +10182,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-452' is-artificial='yes'/>
+            <parameter type-id='type-id-450' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1452'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-422' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-420' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-422' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-420' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-872'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-870'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10220,29 +10213,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-502' is-artificial='yes'/>
+            <parameter type-id='type-id-500' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1469'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-427' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-425' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-427' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-425' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-874'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-872'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10251,29 +10244,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-503' is-artificial='yes'/>
+            <parameter type-id='type-id-501' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-428' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-428' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1231'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1229'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10282,29 +10275,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8ClassDefENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-456' is-artificial='yes'/>
+            <parameter type-id='type-id-454' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1475'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8ClassDefENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-408' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-406' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8ClassDefENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-408' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-406' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-876'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-874'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10313,37 +10306,37 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-441' is-artificial='yes'/>
+            <parameter type-id='type-id-439' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-406' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-404' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-406' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-404' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEE9serializeEPNS_22hb_serialize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-406' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-404' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-557'/>
+            <return type-id='type-id-555'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-878'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-301'/>
+      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-876'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-299'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10352,29 +10345,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-456' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-424' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-424' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1234'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1232'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10383,29 +10376,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6DeviceENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-448' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1504'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_6DeviceENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-407' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-405' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_6DeviceENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-407' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-405' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1236'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1234'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10414,8 +10407,8 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;const OT::Record&lt;OT::Feature&gt;::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-439' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-437' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-1685'/>
             <return type-id='type-id-1'/>
@@ -10423,21 +10416,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7FeatureENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-477' is-artificial='yes'/>
+            <parameter type-id='type-id-475' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1517'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7FeatureENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-439' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-437' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1237'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1235'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10446,8 +10439,8 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-405' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-403' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -10455,21 +10448,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13FeatureParamsENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-474' is-artificial='yes'/>
+            <parameter type-id='type-id-472' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1519'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_13FeatureParamsENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-405' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-403' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1238'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1236'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10478,8 +10471,8 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;const OT::Record&lt;OT::LangSys&gt;::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-404' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-402' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-1690'/>
             <return type-id='type-id-1'/>
@@ -10487,29 +10480,29 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7LangSysENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-463' is-artificial='yes'/>
+            <parameter type-id='type-id-461' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1542'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7LangSysENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-404' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-402' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_7LangSysENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-404' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-402' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1239'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1237'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10518,29 +10511,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12LigCaretListENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-452' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1544'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12LigCaretListENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-410' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-408' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12LigCaretListENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-410' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-408' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-880'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-878'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10549,29 +10542,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-453' is-artificial='yes'/>
+            <parameter type-id='type-id-451' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1547'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-423' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-421' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-423' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-421' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-882'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-880'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10580,37 +10573,37 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <parameter type-id='type-id-490' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1550'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-430' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-428' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-430' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-428' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEE9serializeEPNS_22hb_serialize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-430' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-428' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-570'/>
+            <return type-id='type-id-568'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-884'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-882'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10619,37 +10612,37 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-493' is-artificial='yes'/>
+            <parameter type-id='type-id-491' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1553'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-431' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-429' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-431' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-429' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEE9serializeEPNS_22hb_serialize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-431' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-429' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-571'/>
+            <return type-id='type-id-569'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-886'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-884'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10658,29 +10651,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-483' is-artificial='yes'/>
+            <parameter type-id='type-id-481' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1561'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_6LookupENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-435' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-433' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_6LookupENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-435' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-433' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1244'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1242'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10689,29 +10682,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9MarkArrayENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-521' is-artificial='yes'/>
+            <parameter type-id='type-id-519' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1566'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_9MarkArrayENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-417' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-415' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_9MarkArrayENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-417' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-415' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-888'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-886'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10720,29 +10713,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13MarkGlyphSetsENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-459' is-artificial='yes'/>
+            <parameter type-id='type-id-457' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1573'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_13MarkGlyphSetsENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-411' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-409' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_13MarkGlyphSetsENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-411' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-409' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1245'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1243'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10751,8 +10744,8 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-419' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-417' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -10760,21 +10753,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_12AnchorMatrixEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-526' is-artificial='yes'/>
+            <parameter type-id='type-id-524' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1596'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_12AnchorMatrixEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-419' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-417' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1246'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1244'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10783,29 +10776,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_6LookupEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-484' is-artificial='yes'/>
+            <parameter type-id='type-id-482' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1599'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_6LookupEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-414' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-412' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_6LookupEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-414' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-412' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1247'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1245'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10814,22 +10807,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_9PosLookupEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-420' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_9PosLookupEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-420' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1248'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1246'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10838,22 +10831,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_11SubstLookupEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-415' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-413' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12OffsetListOfINS_11SubstLookupEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-415' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-413' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-890'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-888'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10862,30 +10855,30 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;OT::PairSet::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-433' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-431' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
-            <parameter type-id='type-id-1270'/>
+            <parameter type-id='type-id-1268'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1670'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-433' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-431' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-892'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-890'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10894,22 +10887,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-437' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-435' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-437' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-435' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-894'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-892'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10918,8 +10911,8 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-434' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-432' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -10927,21 +10920,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-533' is-artificial='yes'/>
+            <parameter type-id='type-id-531' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1676'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-434' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-432' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1252'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1250'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10950,29 +10943,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12RecordListOfINS_7FeatureEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-479' is-artificial='yes'/>
+            <parameter type-id='type-id-477' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1706'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12RecordListOfINS_7FeatureEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-413' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-411' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12RecordListOfINS_7FeatureEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-413' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-411' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1253'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1251'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -10981,29 +10974,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12RecordListOfINS_6ScriptEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-468' is-artificial='yes'/>
+            <parameter type-id='type-id-466' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1709'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_12RecordListOfINS_6ScriptEEENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-412' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-410' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_12RecordListOfINS_6ScriptEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-412' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-410' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-896'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-894'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -11012,29 +11005,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-496' is-artificial='yes'/>
+            <parameter type-id='type-id-494' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1717'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_4RuleENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-425' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-423' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_4RuleENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-425' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-423' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-898'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-896'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -11043,29 +11036,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-497' is-artificial='yes'/>
+            <parameter type-id='type-id-495' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1720'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-426' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-424' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-426' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-424' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1256'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-1254'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -11074,8 +11067,8 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;const OT::Record&lt;OT::Script&gt;::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-436' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-1695'/>
             <return type-id='type-id-1'/>
@@ -11083,21 +11076,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6ScriptENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-466' is-artificial='yes'/>
+            <parameter type-id='type-id-464' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1725'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_6ScriptENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-436' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-900'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-898'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -11106,29 +11099,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-488' is-artificial='yes'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1728'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-429' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-427' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-429' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-427' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-902'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-900'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -11137,22 +11130,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-436' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-436' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-904'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
+      <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-902'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -11161,8 +11154,8 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-432' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -11170,73 +11163,73 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-506' is-artificial='yes'/>
+            <parameter type-id='type-id-504' is-artificial='yes'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1759'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='neuter' mangled-name='_ZN2OT8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEE6neuterEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-432' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEE9serializeEPNS_22hb_serialize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-432' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-17'/>
-            <return type-id='type-id-1318'/>
+            <return type-id='type-id-1316'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1014'>
+      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1012'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-854' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
-          <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+          <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1013' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1013' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-514' is-artificial='yes'/>
+            <parameter type-id='type-id-512' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1506'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1016'>
+      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1014'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-856' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-854' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-461' is-artificial='yes'/>
+            <parameter type-id='type-id-459' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-1537'/>
@@ -11244,162 +11237,162 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-461' is-artificial='yes'/>
+            <parameter type-id='type-id-459' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1536'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1018'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1016'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-855' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeIjLj3EEENS1_ItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1019' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_7IntTypeIjLj3EEENS1_ItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1019' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1020'>
+      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1018'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_12LookupRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1021' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_12LookupRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1021' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1022'>
+      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1020'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-861' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_10MarkRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1023' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_10MarkRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1023' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_10MarkRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-519' is-artificial='yes'/>
+            <parameter type-id='type-id-517' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1586'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1024'>
+      <class-decl name='ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1022'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-861' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-481' is-artificial='yes'/>
+            <parameter type-id='type-id-479' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-545' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-545' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E9serializeEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='818' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-545' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1025'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1023'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -11407,458 +11400,458 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1027'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1025'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS0_INS_7IntTypeItLj2EEES3_EES3_EES3_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-440' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1611'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS0_INS_7IntTypeItLj2EEES3_EES3_EES3_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1028' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS0_INS_7IntTypeItLj2EEES3_EES3_EES3_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1028' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1029'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1027'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1028' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1028' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-444' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-452'/>
+            <return type-id='type-id-450'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1031'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1029'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-873' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-500' is-artificial='yes'/>
+            <parameter type-id='type-id-498' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1616'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1032' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1033'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1031'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-873' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-499' is-artificial='yes'/>
+            <parameter type-id='type-id-497' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1618'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1032' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1035'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1033'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-504' is-artificial='yes'/>
+            <parameter type-id='type-id-502' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-504' is-artificial='yes'/>
+            <parameter type-id='type-id-502' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1621'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1037'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1035'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEENS3_ItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-457' is-artificial='yes'/>
+            <parameter type-id='type-id-455' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEENS3_ItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1038' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEENS3_ItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1038' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1039'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1037'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1040' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1038' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1040' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1038' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-445' is-artificial='yes'/>
+            <parameter type-id='type-id-443' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1631'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1041'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1039'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-490' is-artificial='yes'/>
+            <parameter type-id='type-id-488' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1633'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-564' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-564' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-490' is-artificial='yes'/>
+            <parameter type-id='type-id-488' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E9serializeEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='818' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-564' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-564' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1241'/>
+            <return type-id='type-id-1239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1042'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1040'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-489' is-artificial='yes'/>
+            <parameter type-id='type-id-487' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1635'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-564' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-564' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-489' is-artificial='yes'/>
+            <parameter type-id='type-id-487' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E9serializeEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='818' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-564' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-564' is-artificial='yes'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1242'/>
+            <return type-id='type-id-1240'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1043'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1041'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1044' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1044' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1045'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1043'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;OT::PairSet::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1046' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1044' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
-            <parameter type-id='type-id-1270'/>
+            <parameter type-id='type-id-1268'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1046' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1044' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-511' is-artificial='yes'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1645'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1047'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1045'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1048' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1046' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1048' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1046' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1049'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1047'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1050' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1048' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -11866,158 +11859,158 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-510' is-artificial='yes'/>
+            <parameter type-id='type-id-508' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1649'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1050' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1048' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1051'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1049'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-897' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-495' is-artificial='yes'/>
+            <parameter type-id='type-id-493' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1653'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1052' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1050' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1052' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1050' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1053'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1051'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-897' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-494' is-artificial='yes'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1655'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1054' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1054' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1055'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1053'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-487' is-artificial='yes'/>
+            <parameter type-id='type-id-485' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1658'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1056' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1054' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1056' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1054' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1057'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1055'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEEES4_E8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1059'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1057'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -12025,248 +12018,248 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-486' is-artificial='yes'/>
+            <parameter type-id='type-id-484' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1662'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEES4_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
+            <parameter type-id='type-id-1058' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1259'/>
+            <return type-id='type-id-1257'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1061'>
+      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1059'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-440' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1679'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1062' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1060' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1062' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1060' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEE8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='815' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-440' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZN2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1062' is-artificial='yes'/>
+            <parameter type-id='type-id-1060' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1276'/>
+            <return type-id='type-id-1274'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1063'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1061'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-909' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-469' is-artificial='yes'/>
+            <parameter type-id='type-id-467' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1682'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-469' is-artificial='yes'/>
+            <parameter type-id='type-id-467' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-478'/>
+            <return type-id='type-id-476'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1064' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1064' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1062' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1065'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1063'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-911' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-909' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-464' is-artificial='yes'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1687'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-464' is-artificial='yes'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-465'/>
+            <return type-id='type-id-463'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1066' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1064' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1066' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1064' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1067'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-1065'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-913' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-911' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-460' is-artificial='yes'/>
+            <parameter type-id='type-id-458' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1692'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-460' is-artificial='yes'/>
+            <parameter type-id='type-id-458' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-467'/>
+            <return type-id='type-id-465'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEE16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='886' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1066' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1066' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::AnchorMatrix&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1825'>
+      <class-decl name='OffsetArrayOf&lt;OT::AnchorMatrix&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1823'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1023'/>
+      </class-decl>
+      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1824'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1025'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1826'>
+      <class-decl name='OffsetArrayOf&lt;OT::CaretValue&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1825'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1027'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::CaretValue&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1827'>
+      <class-decl name='OffsetArrayOf&lt;OT::ChainRule&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1826'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1029'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::ChainRule&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1828'>
+      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1827'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1031'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1829'>
+      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1828'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1033'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1830'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1035'/>
+      <class-decl name='OffsetArrayOf&lt;OT::LigGlyph&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1829'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1037'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::LigGlyph&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1831'>
+      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1830'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1039'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1832'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1041'/>
+      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1831'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1040'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1833'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1042'/>
+      <class-decl name='OffsetArrayOf&lt;OT::Lookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1832'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1041'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::Lookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1834'>
+      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1833'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1043'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1835'>
+      <class-decl name='OffsetArrayOf&lt;OT::PosLookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1834'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1045'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::PosLookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1836'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1047'/>
+      <class-decl name='OffsetArrayOf&lt;OT::Rule&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1835'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1049'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::Rule&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1837'>
+      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1836'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1051'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1838'>
+      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1837'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1053'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1839'>
+      <class-decl name='OffsetArrayOf&lt;OT::SubstLookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1838'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1055'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::SubstLookup&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1840'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1057'/>
-      </class-decl>
-      <class-decl name='OffsetListOf&lt;OT::AnchorMatrix&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1213'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1825'/>
+      <class-decl name='OffsetListOf&lt;OT::AnchorMatrix&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1211'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1823'/>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='917' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1215' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12279,8 +12272,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetListOf&lt;OT::Lookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1216'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1834'/>
+      <class-decl name='OffsetListOf&lt;OT::Lookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1214'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1832'/>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT12OffsetListOfINS_6LookupEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1600' is-artificial='yes'/>
@@ -12290,145 +12283,145 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12OffsetListOfINS_6LookupEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1218' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1216' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetListOf&lt;OT::PosLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1219'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1836'/>
+      <class-decl name='OffsetListOf&lt;OT::PosLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1217'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1834'/>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12OffsetListOfINS_9PosLookupEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1221' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1219' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetListOf&lt;OT::SubstLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1222'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1840'/>
+      <class-decl name='OffsetListOf&lt;OT::SubstLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1220'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1838'/>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12OffsetListOfINS_11SubstLookupEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1224' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1222' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='927' column='1' id='type-id-1166'>
+      <class-decl name='HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='927' column='1' id='type-id-1164'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='972' column='1'/>
+          <var-decl name='len' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='972' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
+          <var-decl name='array' type-id='type-id-677' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='975' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_E8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='933' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-491' is-artificial='yes'/>
+            <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='928' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-491' is-artificial='yes'/>
+            <parameter type-id='type-id-489' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-294'/>
+            <return type-id='type-id-292'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize_shallow' mangled-name='_ZN2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_E16sanitize_shallowEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='951' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-568' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_E8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='956' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-568' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_E9serializeEPNS_22hb_serialize_context_tERNS_8SupplierIS2_EEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-568' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1744'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-704'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1746' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1746' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1747'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1061'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1059'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1749' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1749' is-artificial='yes'/>
-            <parameter type-id='type-id-825'/>
+            <parameter type-id='type-id-823'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1841'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1063'/>
+      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1839'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1061'/>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1750'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1065'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1063'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <parameter type-id='type-id-1803'/>
+            <parameter type-id='type-id-1807'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1753'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1067'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1065'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1755' is-artificial='yes'/>
-            <parameter type-id='type-id-1803'/>
+            <parameter type-id='type-id-1807'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Record&lt;OT::Feature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-908'>
+      <class-decl name='Record&lt;OT::Feature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-906'>
         <member-type access='public'>
           <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1683'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
+          <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='offset' type-id='type-id-1236' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
+          <var-decl name='offset' type-id='type-id-1234' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='79' column='1'/>
@@ -12438,22 +12431,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT6RecordINS_7FeatureEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1277' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Record&lt;OT::LangSys&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-910'>
+      <class-decl name='Record&lt;OT::LangSys&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-908'>
         <member-type access='public'>
           <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1688'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
+          <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='offset' type-id='type-id-1238' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
+          <var-decl name='offset' type-id='type-id-1236' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='79' column='1'/>
@@ -12463,29 +12456,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT6RecordINS_7LangSysEE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-465' is-artificial='yes'/>
+            <parameter type-id='type-id-463' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT6RecordINS_7LangSysEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1281' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1279' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Record&lt;OT::Script&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-912'>
+      <class-decl name='Record&lt;OT::Script&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-910'>
         <member-type access='public'>
           <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1693'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='tag' type-id='type-id-259' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
+          <var-decl name='tag' type-id='type-id-257' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='offset' type-id='type-id-1256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
+          <var-decl name='offset' type-id='type-id-1254' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='79' column='1'/>
@@ -12495,22 +12488,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT6RecordINS_6ScriptEE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-467' is-artificial='yes'/>
+            <parameter type-id='type-id-465' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT6RecordINS_6ScriptEE8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1283' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1281' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1696'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1841'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1839'/>
         <member-function access='public'>
           <function-decl name='get_tag' mangled-name='_ZNK2OT13RecordArrayOfINS_7FeatureEE7get_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1698' is-artificial='yes'/>
@@ -12523,7 +12516,7 @@
             <parameter type-id='type-id-1698' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
@@ -12543,7 +12536,7 @@
             <parameter type-id='type-id-1701' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
@@ -12563,12 +12556,12 @@
             <parameter type-id='type-id-1704' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1284'>
+      <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1282'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1696'/>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT12RecordListOfINS_7FeatureEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12579,13 +12572,13 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12RecordListOfINS_7FeatureEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1284' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='RecordListOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1287'>
+      <class-decl name='RecordListOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1285'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1702'/>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT12RecordListOfINS_6ScriptEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12596,21 +12589,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12RecordListOfINS_6ScriptEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1289' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1287' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='RangeRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='132' column='1' id='type-id-906'>
+      <class-decl name='RangeRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='132' column='1' id='type-id-904'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='start' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
+          <var-decl name='start' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='end' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
+          <var-decl name='end' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='value' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='153' column='1'/>
+          <var-decl name='value' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='153' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
@@ -12621,14 +12614,14 @@
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
@@ -12642,20 +12635,20 @@
         <member-function access='public'>
           <function-decl name='intersects' mangled-name='_ZNK2OT11RangeRecord10intersectsEPK8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='IndexArray' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-1538'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1016'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1014'/>
         <member-function access='public'>
           <function-decl name='get_indexes' mangled-name='_ZNK2OT10IndexArray11get_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1540' is-artificial='yes'/>
@@ -12666,12 +12659,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-1169'>
+      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-1167'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='lookupOrderZ' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
+          <var-decl name='lookupOrderZ' type-id='type-id-860' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='reqFeatureIndex' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='209' column='1'/>
+          <var-decl name='reqFeatureIndex' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='209' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <var-decl name='featureIndex' type-id='type-id-1538' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
@@ -12681,20 +12674,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_feature_count' mangled-name='_ZNK2OT7LangSys17get_feature_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_feature_index' mangled-name='_ZNK2OT7LangSys17get_feature_indexEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-187'/>
+            <return type-id='type-id-185'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_feature_indexes' mangled-name='_ZNK2OT7LangSys19get_feature_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-59'/>
@@ -12703,28 +12696,28 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_required_feature_index' mangled-name='_ZNK2OT7LangSys26get_required_feature_indexEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='has_required_feature' mangled-name='_ZNK2OT7LangSys20has_required_featureEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7LangSys8sanitizeEPNS_21hb_sanitize_context_tEPKNS_6RecordIS0_E18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1171' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1169' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-1690'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Script' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='220' column='1' id='type-id-1300'>
+      <class-decl name='Script' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='220' column='1' id='type-id-1298'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='defaultLangSys' type-id='type-id-1238' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='248' column='1'/>
+          <var-decl name='defaultLangSys' type-id='type-id-1236' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='248' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <var-decl name='langSys' type-id='type-id-1699' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='251' column='1'/>
@@ -12740,8 +12733,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT6Script8sanitizeEPNS_21hb_sanitize_context_tEPKNS_6RecordIS0_E18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1302' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1300' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-1695'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12751,7 +12744,7 @@
             <parameter type-id='type-id-1726' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
@@ -12765,27 +12758,27 @@
         <member-function access='public'>
           <function-decl name='find_lang_sys_index' mangled-name='_ZNK2OT6Script19find_lang_sys_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='FeatureParamsSize' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-1154'>
+      <class-decl name='FeatureParamsSize' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-1152'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='designSize' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='332' column='1'/>
+          <var-decl name='designSize' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='332' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='subfamilyID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='337' column='1'/>
+          <var-decl name='subfamilyID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='337' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='subfamilyNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='347' column='1'/>
+          <var-decl name='subfamilyNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='347' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
-          <var-decl name='rangeStart' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='361' column='1'/>
+          <var-decl name='rangeStart' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='361' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='rangeEnd' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='364' column='1'/>
+          <var-decl name='rangeEnd' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='364' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='368' column='1'/>
@@ -12795,18 +12788,18 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17FeatureParamsSize8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1155' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1153' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='FeatureParamsStylisticSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-1156'>
+      <class-decl name='FeatureParamsStylisticSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-1154'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='version' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='381' column='1'/>
+          <var-decl name='version' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='381' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='uiNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='386' column='1'/>
+          <var-decl name='uiNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='401' column='1'/>
@@ -12816,61 +12809,61 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT25FeatureParamsStylisticSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1157' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='FeatureParamsCharacterVariants' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-1152'>
+      <class-decl name='FeatureParamsCharacterVariants' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-1150'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='413' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='413' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='featUILableNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='414' column='1'/>
+          <var-decl name='featUILableNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='414' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='featUITooltipTextNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='419' column='1'/>
+          <var-decl name='featUITooltipTextNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='419' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
-          <var-decl name='sampleTextNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='425' column='1'/>
+          <var-decl name='sampleTextNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='425' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='numNamedParameters' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='429' column='1'/>
+          <var-decl name='numNamedParameters' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='429' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='80'>
-          <var-decl name='firstParamUILabelNameID' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='431' column='1'/>
+          <var-decl name='firstParamUILabelNameID' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='431' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
-          <var-decl name='characters' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
+          <var-decl name='characters' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='442' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT30FeatureParamsCharacterVariants8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1153' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='FeatureParams' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='446' column='1' id='type-id-1149'>
+      <class-decl name='FeatureParams' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='446' column='1' id='type-id-1147'>
         <member-type access='private'>
-          <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-1843'>
+          <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-1841'>
             <data-member access='public'>
-              <var-decl name='size' type-id='type-id-1154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
+              <var-decl name='size' type-id='type-id-1152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='stylisticSet' type-id='type-id-1156' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
+              <var-decl name='stylisticSet' type-id='type-id-1154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='characterVariants' type-id='type-id-1152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
+              <var-decl name='characterVariants' type-id='type-id-1150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='470' column='1'/>
+          <var-decl name='u' type-id='type-id-1841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='470' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
@@ -12880,23 +12873,23 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT13FeatureParams8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='447' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1151' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-1149' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
+            <parameter type-id='type-id-185'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_size_params' mangled-name='_ZNK2OT13FeatureParams15get_size_paramsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <return type-id='type-id-1523'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-1146'>
+      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-1144'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='featureParams' type-id='type-id-1237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
+          <var-decl name='featureParams' type-id='type-id-1235' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <var-decl name='lookupIndex' type-id='type-id-1538' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
@@ -12906,21 +12899,21 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7Feature8sanitizeEPNS_21hb_sanitize_context_tEPKNS_6RecordIS0_E18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1148' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1146' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-1685'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_feature_params' mangled-name='_ZNK2OT7Feature18get_feature_paramsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-475' is-artificial='yes'/>
+            <parameter type-id='type-id-473' is-artificial='yes'/>
             <return type-id='type-id-1519'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lookup_indexes' mangled-name='_ZNK2OT7Feature18get_lookup_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='480' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-475' is-artificial='yes'/>
+            <parameter type-id='type-id-473' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-59'/>
@@ -12928,51 +12921,51 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Lookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='561' column='1' id='type-id-1183'>
+      <class-decl name='Lookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='561' column='1' id='type-id-1181'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='lookupType' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='610' column='1'/>
+          <var-decl name='lookupType' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='610' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='lookupFlag' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='611' column='1'/>
+          <var-decl name='lookupFlag' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='611' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='subTable' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='613' column='1'/>
+          <var-decl name='subTable' type-id='type-id-1022' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='613' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='markFilteringSetX' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
+          <var-decl name='markFilteringSetX' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='618' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_props' mangled-name='_ZNK2OT6Lookup9get_propsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='569' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
             <return type-id='type-id-100'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_type' mangled-name='_ZNK2OT6Lookup8get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='564' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_subtable_count' mangled-name='_ZNK2OT6Lookup18get_subtable_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='562' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT6Lookup8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='598' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-544' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT6Lookup9serializeEPNS_22hb_serialize_context_tEjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='580' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-544' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-100'/>
             <parameter type-id='type-id-12'/>
@@ -12980,9 +12973,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-1125'>
+      <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-1123'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1126'>
+          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1124'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='c' type-id='type-id-1494' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
             </data-member>
@@ -12991,39 +12984,39 @@
             </data-member>
             <member-function access='public'>
               <function-decl name='get_coverage' mangled-name='_ZN2OT15CoverageFormat14Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='677' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <return type-id='type-id-74'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='more' mangled-name='_ZN2OT15CoverageFormat14Iter4moreEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='674' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='init' mangled-name='_ZN2OT15CoverageFormat14Iter4initERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <parameter type-id='type-id-1493'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='next' mangled-name='_ZN2OT15CoverageFormat14Iter4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='675' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='get_glyph' mangled-name='_ZN2OT15CoverageFormat14Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='676' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1127' is-artificial='yes'/>
+                <parameter type-id='type-id-1125' is-artificial='yes'/>
                 <return type-id='type-id-74'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='coverageFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='686' column='1'/>
+          <var-decl name='coverageFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='686' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <var-decl name='glyphArray' type-id='type-id-1744' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='688' column='1'/>
@@ -13034,14 +13027,14 @@
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1494' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1494' is-artificial='yes'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
@@ -13055,38 +13048,38 @@
         <member-function access='private'>
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT15CoverageFormat119intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='659' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1494' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize' mangled-name='_ZN2OT15CoverageFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-549' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-547' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1494' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='serialize' mangled-name='_ZN2OT15CoverageFormat19serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='640' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-549' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-547' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-1128'>
+      <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-1126'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1129'>
+          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1127'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='c' type-id='type-id-1497' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
             </data-member>
@@ -13101,39 +13094,39 @@
             </data-member>
             <member-function access='public'>
               <function-decl name='get_coverage' mangled-name='_ZN2OT15CoverageFormat24Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <return type-id='type-id-74'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='more' mangled-name='_ZN2OT15CoverageFormat24Iter4moreEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='776' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='init' mangled-name='_ZN2OT15CoverageFormat24Iter4initERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <parameter type-id='type-id-1496'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='next' mangled-name='_ZN2OT15CoverageFormat24Iter4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='777' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='get_glyph' mangled-name='_ZN2OT15CoverageFormat24Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='787' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1130' is-artificial='yes'/>
+                <parameter type-id='type-id-1128' is-artificial='yes'/>
                 <return type-id='type-id-74'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='coverageFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='797' column='1'/>
+          <var-decl name='coverageFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='797' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <var-decl name='rangeRecord' type-id='type-id-1747' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='799' column='1'/>
@@ -13144,14 +13137,14 @@
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
@@ -13165,45 +13158,45 @@
         <member-function access='private'>
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT15CoverageFormat219intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize' mangled-name='_ZN2OT15CoverageFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-553' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-551' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='serialize' mangled-name='_ZN2OT15CoverageFormat29serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='708' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-553' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-551' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-1122'>
+      <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-1120'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-1123'>
+          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-1121'>
             <member-type access='private'>
-              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-1844'>
+              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-1842'>
                 <data-member access='public'>
-                  <var-decl name='format1' type-id='type-id-1126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
+                  <var-decl name='format1' type-id='type-id-1124' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
                 <data-member access='public'>
-                  <var-decl name='format2' type-id='type-id-1129' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
+                  <var-decl name='format2' type-id='type-id-1127' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
               </union-decl>
             </member-type>
@@ -13211,62 +13204,62 @@
               <var-decl name='format' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='912' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
-              <var-decl name='u' type-id='type-id-1844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
+              <var-decl name='u' type-id='type-id-1842' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Iter' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='873' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='more' mangled-name='_ZN2OT8Coverage4Iter4moreEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='882' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='get_coverage' mangled-name='_ZN2OT8Coverage4Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='903' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <return type-id='type-id-74'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='init' mangled-name='_ZN2OT8Coverage4Iter4initERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
-                <parameter type-id='type-id-979'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
+                <parameter type-id='type-id-977'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='next' mangled-name='_ZN2OT8Coverage4Iter4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='889' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='get_glyph' mangled-name='_ZN2OT8Coverage4Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='896' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1124' is-artificial='yes'/>
+                <parameter type-id='type-id-1122' is-artificial='yes'/>
                 <return type-id='type-id-74'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-1845'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-1843'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1125' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='922' column='1'/>
+              <var-decl name='format1' type-id='type-id-1123' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='922' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='923' column='1'/>
+              <var-decl name='format2' type-id='type-id-1126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='923' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
+          <var-decl name='u' type-id='type-id-1843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='926' column='1'/>
@@ -13274,14 +13267,14 @@
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT8Coverage19intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -13296,88 +13289,88 @@
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' mangled-name='_ZNK2OT8Coverage12add_coverageI8hb_set_tEEvPT_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intersects' mangled-name='_ZNK2OT8Coverage10intersectsEPK8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='845' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8Coverage8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='835' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-539' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT8Coverage9serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='817' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-539' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ClassDefFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-1104'>
+      <class-decl name='ClassDefFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-1102'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='classFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='981' column='1'/>
+          <var-decl name='classFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='981' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='startGlyph' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
+          <var-decl name='startGlyph' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='classValue' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='984' column='1'/>
+          <var-decl name='classValue' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='984' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='986' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='952' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-455' is-artificial='yes'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-453' is-artificial='yes'/>
+            <parameter type-id='type-id-958'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_class' mangled-name='_ZNK2OT15ClassDefFormat19get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='939' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-455' is-artificial='yes'/>
+            <parameter type-id='type-id-453' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize' mangled-name='_ZN2OT15ClassDefFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='946' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1105' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1103' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='intersects_class' mangled-name='_ZNK2OT15ClassDefFormat116intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='959' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-455' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-453' is-artificial='yes'/>
+            <parameter type-id='type-id-1840'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ClassDefFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='990' column='1' id='type-id-1106'>
+      <class-decl name='ClassDefFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='990' column='1' id='type-id-1104'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='classFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1040' column='1'/>
+          <var-decl name='classFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1040' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <var-decl name='rangeRecord' type-id='type-id-1747' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1042' column='1'/>
@@ -13388,7 +13381,7 @@
         <member-function access='private'>
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1008' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1479' is-artificial='yes'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
@@ -13402,44 +13395,44 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize' mangled-name='_ZN2OT15ClassDefFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1002' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1107' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1105' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='intersects_class' mangled-name='_ZNK2OT15ClassDefFormat216intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1015' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1479' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ClassDef' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1049' column='1' id='type-id-1101'>
+      <class-decl name='ClassDef' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1049' column='1' id='type-id-1099'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1086' column='1' id='type-id-1846'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1086' column='1' id='type-id-1844'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1087' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1087' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
+              <var-decl name='format1' type-id='type-id-1102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1089' column='1'/>
+              <var-decl name='format2' type-id='type-id-1104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1089' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1090' column='1'/>
+          <var-decl name='u' type-id='type-id-1844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1090' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1092' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8ClassDef8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1059' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1101' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13453,7 +13446,7 @@
         <member-function access='public'>
           <function-decl name='intersects_class' mangled-name='_ZNK2OT8ClassDef16intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1077' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1840'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -13461,77 +13454,77 @@
         <member-function access='public'>
           <function-decl name='add_class' mangled-name='_ZNK2OT8ClassDef9add_classEP8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1069' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Device' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-1135'>
+      <class-decl name='Device' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-1133'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='startSize' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1157' column='1'/>
+          <var-decl name='startSize' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1157' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='endSize' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1158' column='1'/>
+          <var-decl name='endSize' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1158' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='deltaFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1159' column='1'/>
+          <var-decl name='deltaFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1159' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='deltaValue' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
+          <var-decl name='deltaValue' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1166' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_delta_pixels' mangled-name='_ZNK2OT6Device16get_delta_pixelsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT6Device8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT6Device8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1151' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1137' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_x_delta' mangled-name='_ZNK2OT6Device11get_x_deltaEP9hb_font_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <return type-id='type-id-103'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_y_delta' mangled-name='_ZNK2OT6Device11get_y_deltaEP9hb_font_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1106' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <return type-id='type-id-103'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_delta' mangled-name='_ZNK2OT6Device9get_deltaEji' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-449' is-artificial='yes'/>
+            <parameter type-id='type-id-447' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-9'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AttachList' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='48' column='1' id='type-id-1069'>
+      <class-decl name='AttachList' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='48' column='1' id='type-id-1067'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='81' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='81' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='attachPoint' type-id='type-id-1826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='84' column='1'/>
+          <var-decl name='attachPoint' type-id='type-id-1824' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='84' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='87' column='1'/>
@@ -13548,18 +13541,18 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT10AttachList8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1071' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1069' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CaretValueFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-1075'>
+      <class-decl name='CaretValueFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-1073'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='caretValueFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='110' column='1'/>
+          <var-decl name='caretValueFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='110' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='111' column='1'/>
+          <var-decl name='coordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='111' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='113' column='1'/>
@@ -13569,14 +13562,14 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17CaretValueFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1076' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1074' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat115get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-447' is-artificial='yes'/>
+            <parameter type-id='type-id-445' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-64'/>
@@ -13584,12 +13577,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CaretValueFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-1077'>
+      <class-decl name='CaretValueFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-1075'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='caretValueFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='136' column='1'/>
+          <var-decl name='caretValueFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='136' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='caretValuePoint' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='137' column='1'/>
+          <var-decl name='caretValuePoint' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='137' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='139' column='1'/>
@@ -13599,14 +13592,14 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17CaretValueFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1078' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1076' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat215get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-448' is-artificial='yes'/>
+            <parameter type-id='type-id-446' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-64'/>
@@ -13614,15 +13607,15 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CaretValueFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-1079'>
+      <class-decl name='CaretValueFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-1077'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='caretValueFormat' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='159' column='1'/>
+          <var-decl name='caretValueFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='159' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='160' column='1'/>
+          <var-decl name='coordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='160' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='deviceTable' type-id='type-id-1234' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='162' column='1'/>
+          <var-decl name='deviceTable' type-id='type-id-1232' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='162' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
@@ -13632,14 +13625,14 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17CaretValueFormat38sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1080' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1078' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat315get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-451' is-artificial='yes'/>
+            <parameter type-id='type-id-449' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-64'/>
@@ -13647,33 +13640,33 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CaretValue' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='170' column='1' id='type-id-1072'>
+      <class-decl name='CaretValue' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='170' column='1' id='type-id-1070'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='48' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='193' column='1' id='type-id-1847'>
+          <union-decl name='__anonymous_union__' size-in-bits='48' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='193' column='1' id='type-id-1845'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='194' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='194' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1075' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
+              <var-decl name='format1' type-id='type-id-1073' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1077' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
+              <var-decl name='format2' type-id='type-id-1075' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format3' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
+              <var-decl name='format3' type-id='type-id-1077' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='198' column='1'/>
+          <var-decl name='u' type-id='type-id-1845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='200' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT10CaretValue8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1074' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1072' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13687,17 +13680,17 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LigGlyph' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='204' column='1' id='type-id-1175'>
+      <class-decl name='LigGlyph' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='204' column='1' id='type-id-1173'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='carets' type-id='type-id-1827' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='229' column='1'/>
+          <var-decl name='carets' type-id='type-id-1825' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='229' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='233' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8LigGlyph8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1177' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1175' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13709,25 +13702,25 @@
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LigCaretList' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='237' column='1' id='type-id-1172'>
+      <class-decl name='LigCaretList' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='237' column='1' id='type-id-1170'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='263' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='263' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='ligGlyph' type-id='type-id-1831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='266' column='1'/>
+          <var-decl name='ligGlyph' type-id='type-id-1829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='266' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='269' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12LigCaretList8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1174' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13739,17 +13732,17 @@
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkGlyphSetsFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='274' column='1' id='type-id-1196'>
+      <class-decl name='MarkGlyphSetsFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='274' column='1' id='type-id-1194'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='284' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='284' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-1037' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='286' column='1'/>
+          <var-decl name='coverage' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='286' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='289' column='1'/>
@@ -13764,25 +13757,25 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT20MarkGlyphSetsFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1197' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1195' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkGlyphSets' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='293' column='1' id='type-id-1193'>
+      <class-decl name='MarkGlyphSets' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='293' column='1' id='type-id-1191'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='312' column='1' id='type-id-1848'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='312' column='1' id='type-id-1846'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='313' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='313' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1196' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='314' column='1'/>
+              <var-decl name='format1' type-id='type-id-1194' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='314' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='315' column='1'/>
+          <var-decl name='u' type-id='type-id-1846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='315' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='317' column='1'/>
@@ -13797,15 +13790,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT13MarkGlyphSets8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='302' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1195' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1193' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='GDEF' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='326' column='1' id='type-id-1158'>
+      <class-decl name='GDEF' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='326' column='1' id='type-id-1156'>
         <member-type access='public'>
-          <enum-decl name='GlyphClasses' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='329' column='1' id='type-id-1849'>
+          <enum-decl name='GlyphClasses' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='329' column='1' id='type-id-1847'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='UnclassifiedGlyph' value='0'/>
             <enumerator name='BaseGlyph' value='1'/>
@@ -13815,25 +13808,25 @@
           </enum-decl>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='327' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='327' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='402' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='402' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='glyphClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='405' column='1'/>
+          <var-decl name='glyphClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='405' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='attachList' type-id='type-id-1227' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='409' column='1'/>
+          <var-decl name='attachList' type-id='type-id-1225' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='409' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='ligCaretList' type-id='type-id-1239' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='413' column='1'/>
+          <var-decl name='ligCaretList' type-id='type-id-1237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='413' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='markAttachClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='417' column='1'/>
+          <var-decl name='markAttachClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='417' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='markGlyphSetsDef' type-id='type-id-889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='421' column='1'/>
+          <var-decl name='markGlyphSetsDef' type-id='type-id-887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='421' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='426' column='1'/>
@@ -13874,7 +13867,7 @@
             <parameter type-id='type-id-64'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
@@ -13892,7 +13885,7 @@
           <function-decl name='get_glyphs_in_class' mangled-name='_ZNK2OT4GDEF19get_glyphs_in_classEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-958'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
@@ -13905,16 +13898,16 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4GDEF8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1159' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1157' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ValueFormat' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-1380'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-832'/>
+      <class-decl name='ValueFormat' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-1378'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-830'/>
         <member-type access='public'>
-          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1850'>
+          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1848'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='xPlacement' value='1'/>
             <enumerator name='yPlacement' value='2'/>
@@ -13931,8 +13924,8 @@
         </member-type>
         <member-function access='private' static='yes'>
           <function-decl name='get_device' mangled-name='_ZN2OT11ValueFormat10get_deviceEPNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379'/>
-            <return type-id='type-id-1235'/>
+            <parameter type-id='type-id-1377'/>
+            <return type-id='type-id-1233'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -13961,29 +13954,29 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize_value' mangled-name='_ZN2OT11ValueFormat14sanitize_valueEPNS_21hb_sanitize_context_tEPvPNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1381' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize_values' mangled-name='_ZN2OT11ValueFormat15sanitize_valuesEPNS_21hb_sanitize_context_tEPvPNS_7IntTypeItLj2EEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1381' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sanitize_value_devices' mangled-name='_ZN2OT11ValueFormat22sanitize_value_devicesEPNS_21hb_sanitize_context_tEPvPNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1381' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13995,10 +13988,10 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize_values_stride_unsafe' mangled-name='_ZN2OT11ValueFormat29sanitize_values_stride_unsafeEPNS_21hb_sanitize_context_tEPvPNS_7IntTypeItLj2EEEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1381' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
-            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1377'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -14016,15 +14009,15 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AnchorFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-1005'>
+      <class-decl name='AnchorFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-1003'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='234' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='234' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='xCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='235' column='1'/>
+          <var-decl name='xCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='235' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='yCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='236' column='1'/>
+          <var-decl name='yCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='236' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='238' column='1'/>
@@ -14034,34 +14027,34 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT13AnchorFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1006' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat110get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-515' is-artificial='yes'/>
+            <parameter type-id='type-id-513' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-64'/>
-            <parameter type-id='type-id-165'/>
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AnchorFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-1007'>
+      <class-decl name='AnchorFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-1005'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='263' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='263' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='xCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='264' column='1'/>
+          <var-decl name='xCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='264' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='yCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='265' column='1'/>
+          <var-decl name='yCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='265' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='anchorPoint' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='266' column='1'/>
+          <var-decl name='anchorPoint' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='266' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='268' column='1'/>
@@ -14071,37 +14064,37 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT13AnchorFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1008' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat210get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-516' is-artificial='yes'/>
+            <parameter type-id='type-id-514' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-64'/>
-            <parameter type-id='type-id-165'/>
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AnchorFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-1009'>
+      <class-decl name='AnchorFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-1007'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='291' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='291' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='xCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='292' column='1'/>
+          <var-decl name='xCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='292' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='yCoordinate' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='293' column='1'/>
+          <var-decl name='yCoordinate' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='293' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='xDeviceTable' type-id='type-id-1234' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='295' column='1'/>
+          <var-decl name='xDeviceTable' type-id='type-id-1232' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='295' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='yDeviceTable' type-id='type-id-1234' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='299' column='1'/>
+          <var-decl name='yDeviceTable' type-id='type-id-1232' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='299' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
@@ -14111,49 +14104,49 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT13AnchorFormat38sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='285' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1010' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat310get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-517' is-artificial='yes'/>
+            <parameter type-id='type-id-515' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-64'/>
-            <parameter type-id='type-id-165'/>
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Anchor' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='307' column='1' id='type-id-1002'>
+      <class-decl name='Anchor' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='307' column='1' id='type-id-1000'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='332' column='1' id='type-id-1851'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='332' column='1' id='type-id-1849'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='333' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='333' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1005' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
+              <var-decl name='format1' type-id='type-id-1003' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
+              <var-decl name='format2' type-id='type-id-1005' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format3' type-id='type-id-1009' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
+              <var-decl name='format3' type-id='type-id-1007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='337' column='1'/>
+          <var-decl name='u' type-id='type-id-1849' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='337' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='339' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT6Anchor8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1004' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1002' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -14162,33 +14155,33 @@
             <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-64'/>
-            <parameter type-id='type-id-165'/>
-            <parameter type-id='type-id-165'/>
+            <parameter type-id='type-id-163'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AnchorMatrix' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-1011'>
+      <class-decl name='AnchorMatrix' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-1009'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='rows' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='363' column='1'/>
+          <var-decl name='rows' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='363' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='matrixZ' type-id='type-id-865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
+          <var-decl name='matrixZ' type-id='type-id-863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='369' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12AnchorMatrix8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1013' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1011' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT12AnchorMatrix10get_anchorEjjjPb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-522' is-artificial='yes'/>
+            <parameter type-id='type-id-520' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-12'/>
@@ -14197,12 +14190,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-860'>
+      <class-decl name='MarkRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-858'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='klass' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='383' column='1'/>
+          <var-decl name='klass' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='383' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='markAnchor' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='385' column='1'/>
+          <var-decl name='markAnchor' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='385' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='388' column='1'/>
@@ -14212,26 +14205,26 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT10MarkRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1207' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1205' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkArray' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='392' column='1' id='type-id-1186'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1022'/>
+      <class-decl name='MarkArray' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='392' column='1' id='type-id-1184'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1020'/>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9MarkArray8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1188' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1186' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT9MarkArray5applyEPNS_18hb_apply_context_tEjjRKNS_12AnchorMatrixEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='393' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1567' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-1417'/>
@@ -14241,151 +14234,151 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SinglePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-1308'>
+      <class-decl name='SinglePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-1306'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='466' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='466' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='468' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='468' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='values' type-id='type-id-1852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
+          <var-decl name='values' type-id='type-id-1850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='476' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT16SinglePosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-529' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <parameter type-id='type-id-527' is-artificial='yes'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT16SinglePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='435' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-529' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-527' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT16SinglePosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-529' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-527' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT16SinglePosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1309' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1307' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SinglePosFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-1310'>
+      <class-decl name='SinglePosFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-1308'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='515' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='515' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='517' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='517' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='valueCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='521' column='1'/>
+          <var-decl name='valueCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='521' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='values' type-id='type-id-1852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
+          <var-decl name='values' type-id='type-id-1850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='525' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT16SinglePosFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='487' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-530' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT16SinglePosFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-530' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT16SinglePosFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-530' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT16SinglePosFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='509' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1311' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SinglePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='529' column='1' id='type-id-1306'>
+      <class-decl name='SinglePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='529' column='1' id='type-id-1304'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='552' column='1' id='type-id-1853'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='552' column='1' id='type-id-1851'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='553' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='553' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1308' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
+              <var-decl name='format1' type-id='type-id-1306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1310' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
+              <var-decl name='format2' type-id='type-id-1308' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1853' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='556' column='1'/>
+          <var-decl name='u' type-id='type-id-1851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='556' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1731' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1731' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1731' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9SinglePos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='541' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1307' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1305' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PairSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-1266'>
+      <class-decl name='PairSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-1264'>
         <member-type access='public'>
-          <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-1269'>
+          <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-1267'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='base' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='628' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='valueFormats' type-id='type-id-1381' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
+              <var-decl name='valueFormats' type-id='type-id-1379' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <var-decl name='len1' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='630' column='1'/>
@@ -14396,26 +14389,26 @@
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='len' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='646' column='1'/>
+          <var-decl name='len' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='646' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='arrayZ' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
+          <var-decl name='arrayZ' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='650' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7PairSet8sanitizeEPNS_21hb_sanitize_context_tEPKNS0_18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1268' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1266' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-1672'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT7PairSet5applyEPNS_18hb_apply_context_tEPKNS_11ValueFormatEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-512' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-510' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <parameter type-id='type-id-1768'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
@@ -14423,171 +14416,171 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT7PairSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tEPKNS_11ValueFormatE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-512' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-510' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <parameter type-id='type-id-1768'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PairPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-1262'>
+      <class-decl name='PairPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-1260'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='700' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='700' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='702' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='702' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat1' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='valueFormat2' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='pairSet' type-id='type-id-1835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
+          <var-decl name='pairSet' type-id='type-id-1833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='714' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14PairPosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-531' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <parameter type-id='type-id-529' is-artificial='yes'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT14PairPosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='669' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-531' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-529' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14PairPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='655' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-531' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-529' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT14PairPosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1263' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1261' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PairPosFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-1264'>
+      <class-decl name='PairPosFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-1262'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='791' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='791' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='793' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='793' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat1' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='valueFormat2' type-id='type-id-1380' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='classDef1' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='802' column='1'/>
+          <var-decl name='classDef1' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='802' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='classDef2' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='806' column='1'/>
+          <var-decl name='classDef2' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='806' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='class1Count' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='809' column='1'/>
+          <var-decl name='class1Count' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='809' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
-          <var-decl name='class2Count' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='811' column='1'/>
+          <var-decl name='class2Count' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='811' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='values' type-id='type-id-1852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
+          <var-decl name='values' type-id='type-id-1850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='817' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14PairPosFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-532' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14PairPosFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='719' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-532' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT14PairPosFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-532' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT14PairPosFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1265' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1263' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PairPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='821' column='1' id='type-id-1260'>
+      <class-decl name='PairPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='821' column='1' id='type-id-1258'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='144' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='844' column='1' id='type-id-1857'>
+          <union-decl name='__anonymous_union__' size-in-bits='144' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='844' column='1' id='type-id-1855'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='845' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='845' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1262' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
+              <var-decl name='format1' type-id='type-id-1260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1264' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
+              <var-decl name='format2' type-id='type-id-1262' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='848' column='1'/>
+          <var-decl name='u' type-id='type-id-1855' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='848' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1664' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1664' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1664' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7PairPos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='833' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1261' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1259' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='EntryExitRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='853' column='1' id='type-id-853'>
+      <class-decl name='EntryExitRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='853' column='1' id='type-id-851'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='entryAnchor' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='863' column='1'/>
+          <var-decl name='entryAnchor' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='863' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='exitAnchor' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='867' column='1'/>
+          <var-decl name='exitAnchor' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='867' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='871' column='1'/>
@@ -14597,22 +14590,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT15EntryExitRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1139' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1137' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-17'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CursivePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1133'>
+      <class-decl name='CursivePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1131'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='976' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='976' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='978' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='978' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='entryExitRecord' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
+          <var-decl name='entryExitRecord' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='984' column='1'/>
@@ -14620,92 +14613,92 @@
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT17CursivePosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='882' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1502' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17CursivePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1502' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17CursivePosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='970' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1134' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1132' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT17CursivePosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='887' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1502' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CursivePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='988' column='1' id='type-id-1131'>
+      <class-decl name='CursivePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='988' column='1' id='type-id-1129'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1009' column='1' id='type-id-1858'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1009' column='1' id='type-id-1856'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1010' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1010' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1133' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
+              <var-decl name='format1' type-id='type-id-1131' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1858' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1012' column='1'/>
+          <var-decl name='u' type-id='type-id-1856' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1012' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1499' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1499' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1499' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT10CursivePos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='999' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1132' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1130' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkBasePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-1191'>
+      <class-decl name='MarkBasePosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-1189'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1068' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1068' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='markCoverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1070' column='1'/>
+          <var-decl name='markCoverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1070' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='baseCoverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1073' column='1'/>
+          <var-decl name='baseCoverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1073' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='classCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1075' column='1'/>
+          <var-decl name='classCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1075' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='markArray' type-id='type-id-1244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1077' column='1'/>
+          <var-decl name='markArray' type-id='type-id-1242' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1077' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='baseArray' type-id='type-id-866' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1080' column='1'/>
+          <var-decl name='baseArray' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1080' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1083' column='1'/>
@@ -14715,93 +14708,93 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18MarkBasePosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1030' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-524' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <parameter type-id='type-id-522' is-artificial='yes'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18MarkBasePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1023' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-524' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-522' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT18MarkBasePosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1061' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1192' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1190' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT18MarkBasePosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1035' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-524' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-522' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkBasePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1087' column='1' id='type-id-1189'>
+      <class-decl name='MarkBasePos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1087' column='1' id='type-id-1187'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1108' column='1' id='type-id-1859'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1108' column='1' id='type-id-1857'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1109' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1109' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1191' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
+              <var-decl name='format1' type-id='type-id-1189' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1111' column='1'/>
+          <var-decl name='u' type-id='type-id-1857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1111' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT11MarkBasePos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1098' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1190' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1188' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkLigPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-1200'>
+      <class-decl name='MarkLigPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-1198'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1188' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1188' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='markCoverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1190' column='1'/>
+          <var-decl name='markCoverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1190' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ligatureCoverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1193' column='1'/>
+          <var-decl name='ligatureCoverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1193' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='classCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1196' column='1'/>
+          <var-decl name='classCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1196' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='markArray' type-id='type-id-1244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1198' column='1'/>
+          <var-decl name='markArray' type-id='type-id-1242' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1198' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='ligatureArray' type-id='type-id-1245' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1201' column='1'/>
+          <var-decl name='ligatureArray' type-id='type-id-1243' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1201' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1204' column='1'/>
@@ -14811,93 +14804,93 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT17MarkLigPosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-527' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17MarkLigPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-527' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17MarkLigPosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1201' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1199' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT17MarkLigPosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-527' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkLigPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1208' column='1' id='type-id-1198'>
+      <class-decl name='MarkLigPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1208' column='1' id='type-id-1196'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1229' column='1' id='type-id-1860'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1229' column='1' id='type-id-1858'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1230' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1230' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1200' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
+              <var-decl name='format1' type-id='type-id-1198' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1860' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1232' column='1'/>
+          <var-decl name='u' type-id='type-id-1858' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1232' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT10MarkLigPos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1219' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1199' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1197' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkMarkPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-1204'>
+      <class-decl name='MarkMarkPosFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-1202'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1306' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1306' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='mark1Coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1308' column='1'/>
+          <var-decl name='mark1Coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1308' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='mark2Coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1312' column='1'/>
+          <var-decl name='mark2Coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1312' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='classCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1315' column='1'/>
+          <var-decl name='classCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1315' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='mark1Array' type-id='type-id-1244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1317' column='1'/>
+          <var-decl name='mark1Array' type-id='type-id-1242' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1317' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='mark2Array' type-id='type-id-866' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1320' column='1'/>
+          <var-decl name='mark2Array' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1320' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1323' column='1'/>
@@ -14907,87 +14900,87 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18MarkMarkPosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-528' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <parameter type-id='type-id-526' is-artificial='yes'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18MarkMarkPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1243' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-528' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-526' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT18MarkMarkPosFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1298' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1205' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1203' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT18MarkMarkPosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1255' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-528' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-526' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MarkMarkPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1327' column='1' id='type-id-1202'>
+      <class-decl name='MarkMarkPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1327' column='1' id='type-id-1200'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1348' column='1' id='type-id-1861'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1348' column='1' id='type-id-1859'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1349' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1349' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
+              <var-decl name='format1' type-id='type-id-1202' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1861' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1351' column='1'/>
+          <var-decl name='u' type-id='type-id-1859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1351' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1582' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1582' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1582' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT11MarkMarkPos8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1203' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1201' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ContextPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1355' column='1' id='type-id-1862'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1108'/>
+      <class-decl name='ContextPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1355' column='1' id='type-id-1860'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1106'/>
       </class-decl>
-      <class-decl name='ChainContextPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1357' column='1' id='type-id-1863'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1081'/>
+      <class-decl name='ChainContextPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1357' column='1' id='type-id-1861'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1079'/>
       </class-decl>
-      <class-decl name='ExtensionPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1360' column='1' id='type-id-1864'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1140'/>
+      <class-decl name='ExtensionPos' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1360' column='1' id='type-id-1862'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1138'/>
       </class-decl>
-      <class-decl name='PosLookupSubTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1372' column='1' id='type-id-1273'>
+      <class-decl name='PosLookupSubTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1372' column='1' id='type-id-1271'>
         <member-type access='public'>
-          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1375' column='1' id='type-id-1865'>
+          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1375' column='1' id='type-id-1863'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='Single' value='1'/>
             <enumerator name='Pair' value='2'/>
@@ -15001,41 +14994,41 @@
           </enum-decl>
         </member-type>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1424' column='1' id='type-id-1866'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1424' column='1' id='type-id-1864'>
             <data-member access='public'>
-              <var-decl name='header' type-id='type-id-1867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1427' column='1'/>
+              <var-decl name='header' type-id='type-id-1865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1427' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='single' type-id='type-id-1306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1428' column='1'/>
+              <var-decl name='single' type-id='type-id-1304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1428' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='pair' type-id='type-id-1260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1429' column='1'/>
+              <var-decl name='pair' type-id='type-id-1258' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1429' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='cursive' type-id='type-id-1131' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1430' column='1'/>
+              <var-decl name='cursive' type-id='type-id-1129' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1430' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='markBase' type-id='type-id-1189' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1431' column='1'/>
+              <var-decl name='markBase' type-id='type-id-1187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1431' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='markLig' type-id='type-id-1198' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1432' column='1'/>
+              <var-decl name='markLig' type-id='type-id-1196' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1432' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='markMark' type-id='type-id-1202' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1433' column='1'/>
+              <var-decl name='markMark' type-id='type-id-1200' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1433' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='context' type-id='type-id-1862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1434' column='1'/>
+              <var-decl name='context' type-id='type-id-1860' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1434' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='chainContext' type-id='type-id-1863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1435' column='1'/>
+              <var-decl name='chainContext' type-id='type-id-1861' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1435' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='extension' type-id='type-id-1864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1436' column='1'/>
+              <var-decl name='extension' type-id='type-id-1862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1436' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1866' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1437' column='1'/>
+          <var-decl name='u' type-id='type-id-1864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1439' column='1'/>
@@ -15043,57 +15036,57 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT17PosLookupSubTable8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT17PosLookupSubTable8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17PosLookupSubTable8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1405' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1275' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1273' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PosLookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1444' column='1' id='type-id-945'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1183'/>
+      <class-decl name='PosLookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1444' column='1' id='type-id-943'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1181'/>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1461' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15112,36 +15105,36 @@
         <member-function access='public'>
           <function-decl name='apply_once' mangled-name='_ZNK2OT9PosLookup10apply_onceEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1475' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9PosLookup8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1502' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1272' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1270' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT9PosLookup14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1453' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='apply_recurse_func' mangled-name='_ZN2OT9PosLookup18apply_recurse_funcEPNS_18hb_apply_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1483' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='GPOS' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1517' column='1' id='type-id-1160'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1164'/>
+      <class-decl name='GPOS' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1517' column='1' id='type-id-1158'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1162'/>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1518' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1518' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
@@ -15167,26 +15160,26 @@
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GPOS10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1520' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1529' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-934'/>
+            <return type-id='type-id-932'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4GPOS8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1161' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1159' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SingleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='39' column='1' id='type-id-1314'>
+      <class-decl name='SingleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='39' column='1' id='type-id-1312'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='106' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='106' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='108' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='108' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='deltaGlyphID' type-id='type-id-575' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='110' column='1'/>
+          <var-decl name='deltaGlyphID' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='110' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
@@ -15197,64 +15190,64 @@
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT18SingleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1740' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18SingleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1740' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1740' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18SingleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1740' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT18SingleSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-548' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-546' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT18SingleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1740' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT18SingleSubstFormat19serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEEji' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-548' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-546' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-9'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SingleSubstFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='117' column='1' id='type-id-1315'>
+      <class-decl name='SingleSubstFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='117' column='1' id='type-id-1313'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='182' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='182' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='184' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='184' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='substitute' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='187' column='1'/>
+          <var-decl name='substitute' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='187' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='190' column='1'/>
@@ -15262,135 +15255,135 @@
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT18SingleSubstFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1743' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18SingleSubstFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1743' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1743' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18SingleSubstFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1743' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT18SingleSubstFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-559' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-557' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT18SingleSubstFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1743' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT18SingleSubstFormat29serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEES7_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-559' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-557' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SingleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-1312'>
+      <class-decl name='SingleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-1310'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-1868'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-1866'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1314' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='246' column='1'/>
+              <var-decl name='format1' type-id='type-id-1312' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='246' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1315' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='247' column='1'/>
+              <var-decl name='format2' type-id='type-id-1313' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='247' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1868' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
+          <var-decl name='u' type-id='type-id-1866' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1737' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1737' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1737' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1737' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1737' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT11SingleSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1313' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1311' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1737' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT11SingleSubst9serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEES7_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1313' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-1311' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Sequence' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='253' column='1' id='type-id-1303'>
+      <class-decl name='Sequence' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='253' column='1' id='type-id-1301'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='substitute' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='322' column='1'/>
+          <var-decl name='substitute' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='322' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='324' column='1'/>
@@ -15398,41 +15391,41 @@
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT8Sequence7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1729' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT8Sequence14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1729' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8Sequence8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1305' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1303' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT8Sequence5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1729' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MultipleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-1210'>
+      <class-decl name='MultipleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-1208'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='393' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='393' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='395' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='395' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='sequence' type-id='type-id-1839' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
+          <var-decl name='sequence' type-id='type-id-1837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='401' column='1'/>
@@ -15440,118 +15433,118 @@
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT20MultipleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT20MultipleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT20MultipleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT20MultipleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT20MultipleSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1211' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1209' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT20MultipleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MultipleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-1208'>
+      <class-decl name='MultipleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-1206'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-1871'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-1869'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1210' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
+              <var-decl name='format1' type-id='type-id-1208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
+          <var-decl name='u' type-id='type-id-1869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1588' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1588' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1588' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1588' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1588' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT13MultipleSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1209' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1207' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1588' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AlternateSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-1000'>
+      <class-decl name='AlternateSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-998'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='544' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='544' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='546' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='546' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='alternateSet' type-id='type-id-1826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
+          <var-decl name='alternateSet' type-id='type-id-1824' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='552' column='1'/>
@@ -15559,115 +15552,115 @@
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT21AlternateSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1409' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT21AlternateSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1409' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT21AlternateSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1409' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT21AlternateSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1409' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT21AlternateSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1001' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-999' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT21AlternateSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1409' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AlternateSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-998'>
+      <class-decl name='AlternateSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-996'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-1872'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-1870'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1000' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
+              <var-decl name='format1' type-id='type-id-998' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1872' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
+          <var-decl name='u' type-id='type-id-1870' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT14AlternateSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='583' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-999' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-997' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Ligature' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='601' column='1' id='type-id-1178'>
+      <class-decl name='Ligature' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='601' column='1' id='type-id-1176'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='ligGlyph' type-id='type-id-846' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
+          <var-decl name='ligGlyph' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='component' type-id='type-id-1166' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='697' column='1'/>
+          <var-decl name='component' type-id='type-id-1164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='697' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='701' column='1'/>
@@ -15675,52 +15668,52 @@
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT8Ligature7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT8Ligature14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT8Ligature11would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8Ligature8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-540' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-538' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT8Ligature5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT8Ligature9serializeEPNS_22hb_serialize_context_tENS_7IntTypeItLj2EEERNS_8SupplierIS4_EEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='676' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-540' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-846'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-538' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-844'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LigatureSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='705' column='1' id='type-id-1179'>
+      <class-decl name='LigatureSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='705' column='1' id='type-id-1177'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='ligature' type-id='type-id-1832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
+          <var-decl name='ligature' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='777' column='1'/>
@@ -15728,59 +15721,59 @@
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT11LigatureSet7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1554' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT11LigatureSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='714' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1554' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT11LigatureSet11would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1554' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT11LigatureSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='767' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-541' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-539' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT11LigatureSet5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1554' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT11LigatureSet9serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-541' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-539' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-1376'/>
             <parameter type-id='type-id-12'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LigatureSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='781' column='1' id='type-id-1182'>
+      <class-decl name='LigatureSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='781' column='1' id='type-id-1180'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='857' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='857' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='859' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='859' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ligatureSet' type-id='type-id-1833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
+          <var-decl name='ligatureSet' type-id='type-id-1831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='865' column='1'/>
@@ -15788,143 +15781,143 @@
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT20LigatureSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='802' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1559' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT20LigatureSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1559' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT20LigatureSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='792' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1559' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT20LigatureSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='807' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1559' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT20LigatureSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='851' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-563' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-561' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT20LigatureSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='817' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1559' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT20LigatureSubstFormat19serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_S9_S7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='829' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-563' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-561' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-1376'/>
             <parameter type-id='type-id-12'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-1378'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-1376'/>
+            <parameter type-id='type-id-749'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LigatureSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-1180'>
+      <class-decl name='LigatureSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-1178'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-1873'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-1871'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1182' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='911' column='1'/>
+              <var-decl name='format1' type-id='type-id-1180' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='911' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1873' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
+          <var-decl name='u' type-id='type-id-1871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT13LigatureSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='899' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1181' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1179' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize' mangled-name='_ZN2OT13LigatureSubst9serializeEPNS_22hb_serialize_context_tERNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_S9_S7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='870' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1181' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-1179' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-1376'/>
             <parameter type-id='type-id-12'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-1378'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-1376'/>
+            <parameter type-id='type-id-749'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ContextSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-1874'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1108'/>
+      <class-decl name='ContextSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-1872'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1106'/>
       </class-decl>
-      <class-decl name='ChainContextSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-1875'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1081'/>
+      <class-decl name='ChainContextSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-1873'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1079'/>
       </class-decl>
       <class-decl name='ExtensionSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-1513'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1142'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1140'/>
         <member-function access='public'>
           <function-decl name='is_reverse' mangled-name='_ZNK2OT14ExtensionSubst10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='924' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1515' is-artificial='yes'/>
@@ -15932,21 +15925,21 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ReverseChainSingleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-1292'>
+      <class-decl name='ReverseChainSingleSubstFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-1290'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1032' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1032' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1034' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1034' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='backtrack' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookaheadX' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='substituteX' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1045' column='1'/>
+          <var-decl name='substituteX' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1045' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1048' column='1'/>
@@ -15954,112 +15947,112 @@
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1715' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='979' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1715' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='930' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1715' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='955' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1715' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT30ReverseChainSingleSubstFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1020' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1293' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1291' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1715' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ReverseChainSingleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-1290'>
+      <class-decl name='ReverseChainSingleSubst' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-1288'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-1876'>
+          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-1874'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1292' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
+              <var-decl name='format1' type-id='type-id-1290' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
+          <var-decl name='u' type-id='type-id-1874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT23ReverseChainSingleSubst8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1063' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1291' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1289' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SubstLookupSubTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-1317'>
+      <class-decl name='SubstLookupSubTable' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-1315'>
         <member-type access='public'>
-          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-1877'>
+          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-1875'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='Single' value='1'/>
             <enumerator name='Multiple' value='2'/>
@@ -16072,45 +16065,45 @@
           </enum-decl>
         </member-type>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-1878'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-1876'>
             <member-type access='public'>
-              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-1867'>
+              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-1865'>
                 <data-member access='public' layout-offset-in-bits='0'>
-                  <var-decl name='sub_format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
+                  <var-decl name='sub_format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
                 </data-member>
               </class-decl>
             </member-type>
             <data-member access='public'>
-              <var-decl name='header' type-id='type-id-1867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
+              <var-decl name='header' type-id='type-id-1865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='single' type-id='type-id-1312' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
+              <var-decl name='single' type-id='type-id-1310' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='multiple' type-id='type-id-1208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
+              <var-decl name='multiple' type-id='type-id-1206' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='alternate' type-id='type-id-998' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
+              <var-decl name='alternate' type-id='type-id-996' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='ligature' type-id='type-id-1180' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
+              <var-decl name='ligature' type-id='type-id-1178' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='context' type-id='type-id-1874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
+              <var-decl name='context' type-id='type-id-1872' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='chainContext' type-id='type-id-1875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
+              <var-decl name='chainContext' type-id='type-id-1873' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
             <data-member access='public'>
               <var-decl name='extension' type-id='type-id-1513' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='reverseChainContextSingle' type-id='type-id-1290' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
+              <var-decl name='reverseChainContextSingle' type-id='type-id-1288' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
+          <var-decl name='u' type-id='type-id-1876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1149' column='1'/>
@@ -16118,23 +16111,23 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1760' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_24hb_would_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1760' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT19SubstLookupSubTable8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1117' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-542' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16142,71 +16135,71 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1760' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1760' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1760' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1760' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SubstLookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1154' column='1' id='type-id-938'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1183'/>
+      <class-decl name='SubstLookup' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1154' column='1' id='type-id-936'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1181'/>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -16218,15 +16211,15 @@
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT11SubstLookup11would_applyEPNS_24hb_would_apply_context_tEPK24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES3_IS4_ImLj0EES4_ImLj9EEEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1198' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <parameter type-id='type-id-1802'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1806'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT11SubstLookup8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-543' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -16239,22 +16232,22 @@
         <member-function access='public'>
           <function-decl name='apply_once' mangled-name='_ZNK2OT11SubstLookup10apply_onceEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1206' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT11SubstLookup7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1169' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT11SubstLookup14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1176' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -16266,21 +16259,21 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='dispatch_recurse_func&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='dispatch_recurse_func&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='apply_recurse_func' mangled-name='_ZN2OT11SubstLookup18apply_recurse_funcEPNS_18hb_apply_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1214' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16288,48 +16281,48 @@
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1806'/>
+            <parameter type-id='type-id-1810'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize_subtable' mangled-name='_ZN2OT11SubstLookup18serialize_subtableEPNS_22hb_serialize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-543' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1318'/>
+            <return type-id='type-id-1316'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize_single' mangled-name='_ZN2OT11SubstLookup16serialize_singleEPNS_22hb_serialize_context_tEjRNS_8SupplierINS_7IntTypeItLj2EEEEES7_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1220' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-543' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-100'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-749'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='serialize_ligature' mangled-name='_ZN2OT11SubstLookup18serialize_ligatureEPNS_22hb_serialize_context_tEjRNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_S9_S7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-543' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
+            <parameter type-id='type-id-262'/>
             <parameter type-id='type-id-100'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-1378'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-1376'/>
             <parameter type-id='type-id-12'/>
-            <parameter type-id='type-id-751'/>
-            <parameter type-id='type-id-1378'/>
-            <parameter type-id='type-id-751'/>
+            <parameter type-id='type-id-749'/>
+            <parameter type-id='type-id-1376'/>
+            <parameter type-id='type-id-749'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='GSUB' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1318' column='1' id='type-id-1162'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1164'/>
+      <class-decl name='GSUB' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1318' column='1' id='type-id-1160'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1162'/>
         <data-member access='public' static='yes'>
-          <var-decl name='tableTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1319' column='1'/>
+          <var-decl name='tableTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1319' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
@@ -16355,35 +16348,35 @@
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GSUB10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1321' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1531' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-933'/>
+            <return type-id='type-id-931'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4GSUB8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1327' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1163' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_closure_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1390'>
+      <class-decl name='hb_closure_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1388'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1879' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-1870'/>
+          <typedef-decl name='return_t' type-id='type-id-1877' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-1868'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1810' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1880'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1785' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1878'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='58' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='76' column='1'/>
+          <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='glyphs' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
+          <var-decl name='glyphs' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='recurse_func' type-id='type-id-1880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='79' column='1'/>
@@ -16393,148 +16386,148 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
-            <parameter type-id='type-id-162'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-160'/>
+            <parameter type-id='type-id-958'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1739'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1742'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1408'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1714'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1483'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1486'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1489'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT20hb_closure_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='default_return_value' mangled-name='_ZN2OT20hb_closure_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='recurse' mangled-name='_ZN2OT20hb_closure_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1870'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT20hb_closure_context_t24stop_sublookup_iterationERK10_hb_void_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1778' is-artificial='yes'/>
-            <parameter type-id='type-id-1870'/>
+            <parameter type-id='type-id-1868'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT20hb_closure_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
-            <parameter type-id='type-id-1880'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1878'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
-            <parameter type-id='type-id-162'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-160'/>
+            <parameter type-id='type-id-958'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_would_apply_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1396'>
+      <class-decl name='hb_would_apply_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1394'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-1869'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-1867'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='108' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='115' column='1'/>
+          <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='115' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='glyphs' type-id='type-id-95' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='116' column='1'/>
@@ -16550,8 +16543,8 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-160'/>
             <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-1'/>
@@ -16560,110 +16553,110 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1739'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1742'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1408'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1714'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1483'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1486'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1489'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT24hb_would_apply_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='default_return_value' mangled-name='_ZN2OT24hb_would_apply_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1869'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT24hb_would_apply_context_t24stop_sublookup_iterationEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1782' is-artificial='yes'/>
-            <parameter type-id='type-id-1869'/>
+            <parameter type-id='type-id-1867'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1397' is-artificial='yes'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-160'/>
             <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-1'/>
@@ -16671,36 +16664,36 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_collect_glyphs_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1392'>
+      <class-decl name='hb_collect_glyphs_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1390'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1879' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-1856'/>
+          <typedef-decl name='return_t' type-id='type-id-1877' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-1854'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1812' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1881'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1787' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1879'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='146' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='193' column='1'/>
+          <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='193' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='before' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
+          <var-decl name='before' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='input' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
+          <var-decl name='input' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='after' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
+          <var-decl name='after' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='output' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
+          <var-decl name='output' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='recurse_func' type-id='type-id-1881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='recursed_lookups' type-id='type-id-1882' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
+          <var-decl name='recursed_lookups' type-id='type-id-1880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='66880'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='200' column='1'/>
@@ -16710,218 +16703,218 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
-            <parameter type-id='type-id-162'/>
-            <parameter type-id='type-id-960'/>
-            <parameter type-id='type-id-960'/>
-            <parameter type-id='type-id-960'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-160'/>
+            <parameter type-id='type-id-958'/>
+            <parameter type-id='type-id-958'/>
+            <parameter type-id='type-id-958'/>
+            <parameter type-id='type-id-958'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-9' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1739'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1742'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1408'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1714'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1733'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1735'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1501'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1571'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1580'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1584'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1666'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1668'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1483'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1486'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1489'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT27hb_collect_glyphs_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='default_return_value' mangled-name='_ZN2OT27hb_collect_glyphs_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='recurse' mangled-name='_ZN2OT27hb_collect_glyphs_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1856'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT27hb_collect_glyphs_context_t24stop_sublookup_iterationERK10_hb_void_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1780' is-artificial='yes'/>
-            <parameter type-id='type-id-1856'/>
+            <parameter type-id='type-id-1854'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT27hb_collect_glyphs_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
-            <parameter type-id='type-id-1881'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1879'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
-            <parameter type-id='type-id-162'/>
-            <parameter type-id='type-id-960'/>
-            <parameter type-id='type-id-960'/>
-            <parameter type-id='type-id-960'/>
-            <parameter type-id='type-id-960'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-160'/>
+            <parameter type-id='type-id-958'/>
+            <parameter type-id='type-id-958'/>
+            <parameter type-id='type-id-958'/>
+            <parameter type-id='type-id-958'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-9' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_get_coverage_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1394'>
+      <class-decl name='hb_get_coverage_context_t' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1392'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-979' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-1854'/>
+          <typedef-decl name='return_t' type-id='type-id-977' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-1852'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='238' column='1'/>
@@ -16931,257 +16924,257 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1739'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1742'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1408'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1483'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1486'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1489'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1714'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1733'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1735'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1666'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1668'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1501'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1571'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1580'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1584'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT25hb_get_coverage_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='default_return_value' mangled-name='_ZN2OT25hb_get_coverage_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1739'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1742'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1408'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1483'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1486'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1489'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1714'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-1393' is-artificial='yes'/>
             <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1854'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-1382'>
+      <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-1380'>
         <member-type access='public'>
-          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1384'>
+          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1382'>
             <member-type access='public'>
-              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1883'>
+              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1881'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='MATCH_NO' value='0'/>
                 <enumerator name='MATCH_YES' value='1'/>
@@ -17189,7 +17182,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1884'>
+              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1882'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='SKIP_NO' value='0'/>
                 <enumerator name='SKIP_YES' value='1'/>
@@ -17197,7 +17190,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <typedef-decl name='match_func_t' type-id='type-id-1401' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1885'/>
+              <typedef-decl name='match_func_t' type-id='type-id-1401' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1883'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <var-decl name='lookup_props' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='384' column='1'/>
@@ -17215,56 +17208,56 @@
               <var-decl name='syllable' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='388' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='match_func' type-id='type-id-1885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
+              <var-decl name='match_func' type-id='type-id-1883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='192'>
               <var-decl name='match_data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='390' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='matcher_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <parameter type-id='type-id-12'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_ignore_zwnj' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t15set_ignore_zwnjEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <parameter type-id='type-id-1'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_ignore_zwj' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t14set_ignore_zwjEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <parameter type-id='type-id-1'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_mask' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t8set_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <parameter type-id='type-id-92'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_syllable' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t12set_syllableEh' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <parameter type-id='type-id-76'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
-                <parameter type-id='type-id-1885'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
+                <parameter type-id='type-id-1883'/>
                 <parameter type-id='type-id-17'/>
                 <return type-id='type-id-23'/>
               </function-decl>
@@ -17274,7 +17267,7 @@
                 <parameter type-id='type-id-1772' is-artificial='yes'/>
                 <parameter type-id='type-id-94'/>
                 <parameter type-id='type-id-1764'/>
-                <return type-id='type-id-1883'/>
+                <return type-id='type-id-1881'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -17282,27 +17275,27 @@
                 <parameter type-id='type-id-1772' is-artificial='yes'/>
                 <parameter type-id='type-id-1770'/>
                 <parameter type-id='type-id-94'/>
-                <return type-id='type-id-1884'/>
+                <return type-id='type-id-1882'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='matcher_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1383' is-artificial='yes'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1388'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1386'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
-              <var-decl name='c' type-id='type-id-1383' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
+              <var-decl name='c' type-id='type-id-1381' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='matcher' type-id='type-id-1384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1382' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <var-decl name='match_glyph_data' type-id='type-id-1764' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
@@ -17315,8 +17308,8 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1389' is-artificial='yes'/>
-                <parameter type-id='type-id-1383'/>
+                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1381'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-1'/>
@@ -17331,8 +17324,8 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='416' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1389' is-artificial='yes'/>
-                <parameter type-id='type-id-1885'/>
+                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1883'/>
                 <parameter type-id='type-id-17'/>
                 <parameter type-id='type-id-1764'/>
                 <return type-id='type-id-23'/>
@@ -17340,14 +17333,14 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='next' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='426' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1389' is-artificial='yes'/>
+                <parameter type-id='type-id-1387' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1389' is-artificial='yes'/>
-                <parameter type-id='type-id-1383'/>
+                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1381'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-1'/>
@@ -17357,15 +17350,15 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1386'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1384'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
-              <var-decl name='c' type-id='type-id-1383' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
+              <var-decl name='c' type-id='type-id-1381' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='matcher' type-id='type-id-1384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1382' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <var-decl name='match_glyph_data' type-id='type-id-1764' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
@@ -17375,8 +17368,8 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
-                <parameter type-id='type-id-1383'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1381'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-1'/>
@@ -17391,8 +17384,8 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
-                <parameter type-id='type-id-1885'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
+                <parameter type-id='type-id-1883'/>
                 <parameter type-id='type-id-17'/>
                 <parameter type-id='type-id-1764'/>
                 <return type-id='type-id-23'/>
@@ -17400,30 +17393,30 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
                 <parameter type-id='type-id-12'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='reject' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t6rejectEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='495' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='prev' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1387' is-artificial='yes'/>
+                <parameter type-id='type-id-1385' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-1855'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-1853'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1808' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1886'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1397' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1884'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='264' column='1'/>
@@ -17435,7 +17428,7 @@
           <var-decl name='font' type-id='type-id-147' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
+          <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <var-decl name='buffer' type-id='type-id-145' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
@@ -17450,7 +17443,7 @@
           <var-decl name='auto_zwj' type-id='type-id-1' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='288' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='recurse_func' type-id='type-id-1886' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1884' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='290' column='1'/>
@@ -17469,7 +17462,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-145'/>
@@ -17478,142 +17471,142 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1739'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1742'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1408'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1714'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1483'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1486'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1489'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1501'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1571'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1580'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1584'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1733'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1735'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1666'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1668'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17627,12 +17620,12 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='default_return_value' mangled-name='_ZN2OT18hb_apply_context_t20default_return_valueEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT18hb_apply_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
@@ -17661,35 +17654,35 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='recurse' mangled-name='_ZN2OT18hb_apply_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-1855'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT18hb_apply_context_t24stop_sublookup_iterationEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <parameter type-id='type-id-1855'/>
+            <parameter type-id='type-id-1853'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT18hb_apply_context_t16set_recurse_funcEPFbPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
-            <parameter type-id='type-id-1886'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
+            <parameter type-id='type-id-1884'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_lookup_mask' mangled-name='_ZN2OT18hb_apply_context_t15set_lookup_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-92'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_auto_zwj' mangled-name='_ZN2OT18hb_apply_context_t12set_auto_zwjEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-23'/>
           </function-decl>
@@ -17714,21 +17707,21 @@
         <member-function access='public'>
           <function-decl name='check_glyph_property' mangled-name='_ZNK2OT18hb_apply_context_t20check_glyph_propertyEPK15hb_glyph_info_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <parameter type-id='type-id-1784'/>
+            <parameter type-id='type-id-1788'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_lookup' mangled-name='_ZN2OT18hb_apply_context_t10set_lookupERKNS_6LookupE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='316' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-1561'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-145'/>
@@ -17737,7 +17730,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-145'/>
@@ -17746,33 +17739,33 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-1381' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ContextClosureFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='631' column='1' id='type-id-1887'>
+      <class-decl name='ContextClosureFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='631' column='1' id='type-id-1885'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='intersects' type-id='type-id-1888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='632' column='1'/>
+          <var-decl name='intersects' type-id='type-id-1886' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='632' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ContextCollectGlyphsFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='635' column='1' id='type-id-1889'>
+      <class-decl name='ContextCollectGlyphsFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='635' column='1' id='type-id-1887'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='collect' type-id='type-id-1890' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='636' column='1'/>
+          <var-decl name='collect' type-id='type-id-1888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='636' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ContextApplyFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='639' column='1' id='type-id-1891'>
+      <class-decl name='ContextApplyFuncs' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='639' column='1' id='type-id-1889'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='match' type-id='type-id-1892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='640' column='1'/>
+          <var-decl name='match' type-id='type-id-1890' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='640' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='LookupRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='947' column='1' id='type-id-858'>
+      <class-decl name='LookupRecord' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='947' column='1' id='type-id-856'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='sequenceIndex' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='953' column='1'/>
+          <var-decl name='sequenceIndex' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='953' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='lookupListIndex' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='955' column='1'/>
+          <var-decl name='lookupListIndex' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='955' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
@@ -17781,42 +17774,42 @@
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ContextClosureLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1059' column='1' id='type-id-1112'>
+      <class-decl name='ContextClosureLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1059' column='1' id='type-id-1110'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='funcs' type-id='type-id-1887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1060' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1060' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='intersects_data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1061' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ContextCollectGlyphsLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1065' column='1' id='type-id-1114'>
+      <class-decl name='ContextCollectGlyphsLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1065' column='1' id='type-id-1112'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='funcs' type-id='type-id-1889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1066' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1066' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='collect_data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1067' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ContextApplyLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1071' column='1' id='type-id-1110'>
+      <class-decl name='ContextApplyLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1071' column='1' id='type-id-1108'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='funcs' type-id='type-id-1891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1072' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1072' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='match_data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1073' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Rule' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1135' column='1' id='type-id-1294'>
+      <class-decl name='Rule' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1135' column='1' id='type-id-1292'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='inputCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1181' column='1'/>
+          <var-decl name='inputCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1181' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='lookupCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1184' column='1'/>
+          <var-decl name='lookupCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1184' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='inputZ' type-id='type-id-683' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1185' column='1'/>
+          <var-decl name='inputZ' type-id='type-id-681' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1185' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='lookupRecordX' type-id='type-id-859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1187' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1187' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1190' column='1'/>
@@ -17824,99 +17817,99 @@
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT4Rule7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1136' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1718' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-1389'/>
+            <parameter type-id='type-id-1111'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT4Rule11would_applyEPNS_24hb_would_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1156' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1718' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <parameter type-id='type-id-1111'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1109'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4Rule8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1296' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1294' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT4Rule5applyEPNS_18hb_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1163' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1718' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <parameter type-id='type-id-1111'/>
+            <parameter type-id='type-id-1381'/>
+            <parameter type-id='type-id-1109'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT4Rule14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_33ContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1718' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1113'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='RuleSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1194' column='1' id='type-id-1297'>
+      <class-decl name='RuleSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1194' column='1' id='type-id-1295'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='rule' type-id='type-id-1837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1242' column='1'/>
+          <var-decl name='rule' type-id='type-id-1835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1242' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1245' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7RuleSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1235' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1299' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1297' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT7RuleSet11would_applyEPNS_24hb_would_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1721' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <parameter type-id='type-id-1111'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1109'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT7RuleSet7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1721' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-1389'/>
+            <parameter type-id='type-id-1111'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT7RuleSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_33ContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1721' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1113'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT7RuleSet5applyEPNS_18hb_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1721' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <parameter type-id='type-id-1111'/>
+            <parameter type-id='type-id-1381'/>
+            <parameter type-id='type-id-1109'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ContextFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1116'>
+      <class-decl name='ContextFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1114'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1323' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1323' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1325' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1325' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ruleSet' type-id='type-id-1838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1331' column='1'/>
@@ -17924,57 +17917,57 @@
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1484' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1251' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1484' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1285' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1484' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT14ContextFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1317' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1117' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1115' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1302' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1484' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1484' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ContextFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1118'>
+      <class-decl name='ContextFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1116'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1415' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1415' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1417' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1417' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='classDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1420' column='1'/>
+          <var-decl name='classDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1420' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='ruleSet' type-id='type-id-1838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1426' column='1'/>
@@ -17982,212 +17975,212 @@
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1487' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1374' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1487' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT14ContextFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1119' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1117' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1393' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1487' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1337' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1487' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1487' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ContextFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-1120'>
+      <class-decl name='ContextFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-1118'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1510' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1510' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='glyphCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1511' column='1'/>
+          <var-decl name='glyphCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1511' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='lookupCount' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1513' column='1'/>
+          <var-decl name='lookupCount' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1513' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='coverageZ' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
+          <var-decl name='coverageZ' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookupRecordX' type-id='type-id-859' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1520' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat312get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1478' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-498' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1432' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-498' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat311would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1466' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-498' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT14ContextFormat38sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1497' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1121' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1119' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat35applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1483' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-498' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat314collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1449' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-498' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Context' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-1108'>
+      <class-decl name='Context' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-1106'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1893'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1891'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1116' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
+              <var-decl name='format1' type-id='type-id-1114' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1118' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
+              <var-decl name='format2' type-id='type-id-1116' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format3' type-id='type-id-1120' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
+              <var-decl name='format3' type-id='type-id-1118' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
+          <var-decl name='u' type-id='type-id-1891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT7Context8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT7Context8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1537' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1109' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1107' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT7Context8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ChainContextClosureLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1561' column='1' id='type-id-1085'>
+      <class-decl name='ChainContextClosureLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1561' column='1' id='type-id-1083'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='funcs' type-id='type-id-1887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1562' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1885' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1562' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='intersects_data' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1563' column='1'/>
+          <var-decl name='intersects_data' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1563' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ChainContextCollectGlyphsLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1567' column='1' id='type-id-1087'>
+      <class-decl name='ChainContextCollectGlyphsLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1567' column='1' id='type-id-1085'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='funcs' type-id='type-id-1889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1568' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1568' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='collect_data' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1569' column='1'/>
+          <var-decl name='collect_data' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1569' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ChainContextApplyLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1573' column='1' id='type-id-1083'>
+      <class-decl name='ChainContextApplyLookupContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1573' column='1' id='type-id-1081'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='funcs' type-id='type-id-1891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1574' column='1'/>
+          <var-decl name='funcs' type-id='type-id-1889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1574' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='match_data' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1575' column='1'/>
+          <var-decl name='match_data' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1575' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ChainRule' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1674' column='1' id='type-id-1095'>
+      <class-decl name='ChainRule' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1674' column='1' id='type-id-1093'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='backtrack' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1742' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1742' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='inputX' type-id='type-id-1166' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1746' column='1'/>
+          <var-decl name='inputX' type-id='type-id-1164' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1746' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookaheadX' type-id='type-id-704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1749' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1749' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='lookupX' type-id='type-id-1020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1752' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1752' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1755' column='1'/>
@@ -18195,99 +18188,99 @@
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT9ChainRule7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1675' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <parameter type-id='type-id-1086'/>
+            <parameter type-id='type-id-1389'/>
+            <parameter type-id='type-id-1084'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT9ChainRule11would_applyEPNS_24hb_would_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1703' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1082'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9ChainRule8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1729' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1097' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1095' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT9ChainRule5applyEPNS_18hb_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1716' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1381'/>
+            <parameter type-id='type-id-1082'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT9ChainRule14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_38ChainContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1689' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1088'/>
+            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1086'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ChainRuleSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1759' column='1' id='type-id-1098'>
+      <class-decl name='ChainRuleSet' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1759' column='1' id='type-id-1096'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='rule' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1805' column='1'/>
+          <var-decl name='rule' type-id='type-id-1826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1805' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1808' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12ChainRuleSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1798' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1098' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT12ChainRuleSet11would_applyEPNS_24hb_would_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1776' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1473' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1082'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT12ChainRuleSet7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1760' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1473' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <parameter type-id='type-id-1086'/>
+            <parameter type-id='type-id-1389'/>
+            <parameter type-id='type-id-1084'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT12ChainRuleSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_38ChainContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1768' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1473' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1088'/>
+            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1086'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT12ChainRuleSet5applyEPNS_18hb_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1787' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1473' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1381'/>
+            <parameter type-id='type-id-1082'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ChainContextFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1089'>
+      <class-decl name='ChainContextFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1087'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1883' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1883' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1885' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1885' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ruleSet' type-id='type-id-1829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1827' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1891' column='1'/>
@@ -18295,63 +18288,63 @@
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1858' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1813' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1846' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT19ChainContextFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1877' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1088' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1863' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1831' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ChainContextFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1091'>
+      <class-decl name='ChainContextFormat2' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1089'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1995' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1995' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1997' column='1'/>
+          <var-decl name='coverage' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1997' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='backtrackClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2000' column='1'/>
+          <var-decl name='backtrackClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2000' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='inputClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2004' column='1'/>
+          <var-decl name='inputClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2004' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookaheadClassDef' type-id='type-id-1231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2008' column='1'/>
+          <var-decl name='lookaheadClassDef' type-id='type-id-1229' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2008' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='ruleSet' type-id='type-id-1829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1827' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2015' column='1'/>
@@ -18359,60 +18352,60 @@
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1961' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1464' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1942' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1464' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT19ChainContextFormat28sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1987' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1092' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1090' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1966' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1464' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1896' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1464' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1921' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1464' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ChainContextFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1093'>
+      <class-decl name='ChainContextFormat3' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1091'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2121' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='backtrack' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='inputX' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
+          <var-decl name='inputX' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='lookaheadX' type-id='type-id-1830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
-          <var-decl name='lookupX' type-id='type-id-1020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2138' column='1'/>
@@ -18420,124 +18413,124 @@
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat312get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2081' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1467' is-artificial='yes'/>
-            <return type-id='type-id-979'/>
+            <return type-id='type-id-977'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2020' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1467' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
+            <parameter type-id='type-id-1389'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat311would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2063' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1467' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT19ChainContextFormat38sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1094' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1092' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat35applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2087' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1467' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1381'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat314collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2042' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1467' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ChainContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-1081'>
+      <class-decl name='ChainContext' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-1079'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1894'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1892'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1089' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
+              <var-decl name='format1' type-id='type-id-1087' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format2' type-id='type-id-1091' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
+              <var-decl name='format2' type-id='type-id-1089' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format3' type-id='type-id-1093' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
+              <var-decl name='format3' type-id='type-id-1091' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
+          <var-decl name='u' type-id='type-id-1892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1458' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1458' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1458' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT12ChainContext8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1458' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12ChainContext8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1082' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1080' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT12ChainContext8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1458' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1458' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ExtensionFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-1144'>
+      <class-decl name='ExtensionFormat1' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-1142'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2187' column='1'/>
+          <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2187' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='extensionLookupType' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2188' column='1'/>
+          <var-decl name='extensionLookupType' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2188' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='extensionOffset' type-id='type-id-324' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2191' column='1'/>
+          <var-decl name='extensionOffset' type-id='type-id-322' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2191' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
@@ -18547,27 +18540,27 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_type' mangled-name='_ZNK2OT16ExtensionFormat18get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2178' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-505' is-artificial='yes'/>
+            <parameter type-id='type-id-503' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_offset' mangled-name='_ZNK2OT16ExtensionFormat110get_offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2179' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-505' is-artificial='yes'/>
+            <parameter type-id='type-id-503' is-artificial='yes'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT16ExtensionFormat18sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1145' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1143' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Extension&lt;OT::ExtensionPos&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1140'>
+      <class-decl name='Extension&lt;OT::ExtensionPos&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1138'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
+          <var-decl name='u' type-id='type-id-1893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_subtable&lt;OT::PosLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18578,8 +18571,8 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1509' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -18596,46 +18589,46 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize_self' mangled-name='_ZN2OT9ExtensionINS_12ExtensionPosEE13sanitize_selfEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2229' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1141' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1139' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS5_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1509' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS5_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1509' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9ExtensionINS_12ExtensionPosEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1141' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1139' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1142'>
+      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1140'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1895'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1893'>
             <data-member access='public'>
-              <var-decl name='format' type-id='type-id-373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
+              <var-decl name='format' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='format1' type-id='type-id-1144' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
+              <var-decl name='format1' type-id='type-id-1142' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
+          <var-decl name='u' type-id='type-id-1893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18646,36 +18639,36 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1511' is-artificial='yes'/>
-            <parameter type-id='type-id-1397'/>
-            <return type-id='type-id-1869'/>
+            <parameter type-id='type-id-1395'/>
+            <return type-id='type-id-1867'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1511' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <return type-id='type-id-1856'/>
+            <parameter type-id='type-id-1391'/>
+            <return type-id='type-id-1854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1511' is-artificial='yes'/>
-            <parameter type-id='type-id-1391'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1389'/>
+            <return type-id='type-id-1868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1511' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1855'/>
+            <parameter type-id='type-id-1381'/>
+            <return type-id='type-id-1853'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1511' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -18692,15 +18685,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize_self' mangled-name='_ZN2OT9ExtensionINS_14ExtensionSubstEE13sanitize_selfEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2229' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1143' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT9ExtensionINS_14ExtensionSubstEE8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1143' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -18713,29 +18706,29 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1511' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1854'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1852'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='GSUBGPOS' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2259' column='1' id='type-id-1164'>
+      <class-decl name='GSUBGPOS' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2259' column='1' id='type-id-1162'>
         <data-member access='public' static='yes'>
-          <var-decl name='GSUBTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2260' column='1'/>
+          <var-decl name='GSUBTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2260' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='GPOSTag' type-id='type-id-343' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2261' column='1'/>
+          <var-decl name='GPOSTag' type-id='type-id-341' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2261' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='version' type-id='type-id-233' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2303' column='1'/>
+          <var-decl name='version' type-id='type-id-231' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2303' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='scriptList' type-id='type-id-1253' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2306' column='1'/>
+          <var-decl name='scriptList' type-id='type-id-1251' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2306' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='featureList' type-id='type-id-1252' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2308' column='1'/>
+          <var-decl name='featureList' type-id='type-id-1250' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2308' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookupList' type-id='type-id-1246' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2310' column='1'/>
+          <var-decl name='lookupList' type-id='type-id-1244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2310' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
@@ -18768,7 +18761,7 @@
             <parameter type-id='type-id-1533' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
@@ -18777,7 +18770,7 @@
             <parameter type-id='type-id-1533' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-967'/>
+            <parameter type-id='type-id-965'/>
             <return type-id='type-id-12'/>
           </function-decl>
         </member-function>
@@ -18790,7 +18783,7 @@
         <member-function access='public'>
           <function-decl name='find_script_index' mangled-name='_ZNK2OT8GSUBGPOS17find_script_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1533' is-artificial='yes'/>
-            <parameter type-id='type-id-187'/>
+            <parameter type-id='type-id-185'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18806,106 +18799,106 @@
           <function-decl name='get_feature_tag' mangled-name='_ZNK2OT8GSUBGPOS15get_feature_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2278' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1533' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-187'/>
+            <return type-id='type-id-185'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT8GSUBGPOS8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2294' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1165' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
-            <return type-id='type-id-1'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-      <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1319'/>
-      <class-decl name='Supplier&lt;OT::Index&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1321'/>
-      <class-decl name='Supplier&lt;OT::IntType&lt;unsigned int, 3u&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1323'/>
-      <class-decl name='Supplier&lt;OT::LookupRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1325'/>
-      <class-decl name='Supplier&lt;OT::MarkRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1327'/>
-      <class-decl name='Supplier&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1329'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1331'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1333'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1335'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1337'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1339'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1341'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1343'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1345'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1347'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1349'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1351'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1353'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1355'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1357'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1359'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1361'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1363'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1365'/>
-      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1367'/>
-      <class-decl name='Supplier&lt;OT::RangeRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1369'/>
-      <class-decl name='Supplier&lt;OT::Record&lt;OT::Feature&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1371'/>
-      <class-decl name='Supplier&lt;OT::Record&lt;OT::LangSys&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1373'/>
-      <class-decl name='Supplier&lt;OT::Record&lt;OT::Script&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1375'/>
-      <class-decl name='Supplier&lt;unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-1377'>
+            <parameter type-id='type-id-1163' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
+            <return type-id='type-id-1'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+      <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1317'/>
+      <class-decl name='Supplier&lt;OT::Index&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1319'/>
+      <class-decl name='Supplier&lt;OT::IntType&lt;unsigned int, 3u&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1321'/>
+      <class-decl name='Supplier&lt;OT::LookupRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1323'/>
+      <class-decl name='Supplier&lt;OT::MarkRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1325'/>
+      <class-decl name='Supplier&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1327'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1329'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1331'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1333'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1335'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1337'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1339'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1341'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1343'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1345'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1347'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1349'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1351'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1353'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1355'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1357'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1359'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1361'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1363'/>
+      <class-decl name='Supplier&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1365'/>
+      <class-decl name='Supplier&lt;OT::RangeRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1367'/>
+      <class-decl name='Supplier&lt;OT::Record&lt;OT::Feature&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1369'/>
+      <class-decl name='Supplier&lt;OT::Record&lt;OT::LangSys&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1371'/>
+      <class-decl name='Supplier&lt;OT::Record&lt;OT::Script&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1373'/>
+      <class-decl name='Supplier&lt;unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-1375'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='511' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='head' type-id='type-id-1896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
+          <var-decl name='head' type-id='type-id-1894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1896'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
+            <parameter type-id='type-id-1894'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1898'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
+            <parameter type-id='type-id-1896'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierIjEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-90'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='advance' mangled-name='_ZN2OT8SupplierIjE7advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='Value' type-id='type-id-373' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-914'/>
-      <typedef-decl name='ValueRecord' type-id='type-id-915' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1852'/>
-      <typedef-decl name='intersects_func_t' type-id='type-id-1399' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1888'/>
-      <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1815' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1890'/>
-      <typedef-decl name='match_func_t' type-id='type-id-1401' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='628' column='1' id='type-id-1892'/>
+      <typedef-decl name='Value' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-912'/>
+      <typedef-decl name='ValueRecord' type-id='type-id-913' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1850'/>
+      <typedef-decl name='intersects_func_t' type-id='type-id-1399' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1886'/>
+      <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1813' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1888'/>
+      <typedef-decl name='match_func_t' type-id='type-id-1401' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='628' column='1' id='type-id-1890'/>
     </namespace-decl>
     <function-decl name='hb_ot_layout_has_glyph_classes' mangled-name='hb_ot_layout_has_glyph_classes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_glyph_classes'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='126' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='126' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_glyph_class' mangled-name='hb_ot_layout_get_glyph_class' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_glyph_class'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='133' column='1'/>
-      <return type-id='type-id-948'/>
+      <return type-id='type-id-946'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_glyphs_in_class' mangled-name='hb_ot_layout_get_glyphs_in_class' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_glyphs_in_class'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1'/>
-      <parameter type-id='type-id-948' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='140' column='1'/>
-      <parameter type-id='type-id-960' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='141' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1'/>
+      <parameter type-id='type-id-946' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='140' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='141' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_attach_points' mangled-name='hb_ot_layout_get_attach_points' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_attach_points'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1'/>
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='148' column='1'/>
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='149' column='1'/>
       <parameter type-id='type-id-59' name='point_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='150' column='1'/>
@@ -18918,77 +18911,77 @@
       <parameter type-id='type-id-64' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='159' column='1'/>
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='160' column='1'/>
       <parameter type-id='type-id-59' name='caret_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='161' column='1'/>
-      <parameter type-id='type-id-577' name='caret_array' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='162' column='1'/>
+      <parameter type-id='type-id-575' name='caret_array' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='162' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_ot_layout_table_get_script_tags' mangled-name='hb_ot_layout_table_get_script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_script_tags'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='185' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='186' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='185' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='186' column='1'/>
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='187' column='1'/>
       <parameter type-id='type-id-59' name='script_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='188' column='1'/>
-      <parameter type-id='type-id-967' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='189' column='1'/>
+      <parameter type-id='type-id-965' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='189' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_ot_layout_table_find_script' mangled-name='hb_ot_layout_table_find_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_find_script'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='200' column='1'/>
-      <parameter type-id='type-id-187' name='script_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='201' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='200' column='1'/>
+      <parameter type-id='type-id-185' name='script_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='201' column='1'/>
       <parameter type-id='type-id-59' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='202' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_table_choose_script' mangled-name='hb_ot_layout_table_choose_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_choose_script'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
-      <parameter type-id='type-id-1804' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
+      <parameter type-id='type-id-1808' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
       <parameter type-id='type-id-59' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='232' column='1'/>
-      <parameter type-id='type-id-967' name='chosen_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='233' column='1'/>
+      <parameter type-id='type-id-965' name='chosen_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='233' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_table_get_feature_tags' mangled-name='hb_ot_layout_table_get_feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_feature_tags'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='278' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='278' column='1'/>
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='279' column='1'/>
       <parameter type-id='type-id-59' name='feature_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='280' column='1'/>
-      <parameter type-id='type-id-967' name='feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='281' column='1'/>
+      <parameter type-id='type-id-965' name='feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='281' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_ot_layout_script_get_language_tags' mangled-name='hb_ot_layout_script_get_language_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_script_get_language_tags'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='291' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='291' column='1'/>
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='292' column='1'/>
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='293' column='1'/>
       <parameter type-id='type-id-59' name='language_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='294' column='1'/>
-      <parameter type-id='type-id-967' name='language_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='295' column='1'/>
+      <parameter type-id='type-id-965' name='language_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='295' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_ot_layout_script_find_language' mangled-name='hb_ot_layout_script_find_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_script_find_language'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='304' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='304' column='1'/>
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='305' column='1'/>
-      <parameter type-id='type-id-187' name='language_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='306' column='1'/>
+      <parameter type-id='type-id-185' name='language_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='306' column='1'/>
       <parameter type-id='type-id-59' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='307' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_get_required_feature_index' mangled-name='hb_ot_layout_language_get_required_feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature_index'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='325' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='325' column='1'/>
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='326' column='1'/>
       <parameter type-id='type-id-12' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='327' column='1'/>
       <parameter type-id='type-id-59' name='feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='328' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_get_required_feature' mangled-name='hb_ot_layout_language_get_required_feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='340' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='340' column='1'/>
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='341' column='1'/>
       <parameter type-id='type-id-12' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='342' column='1'/>
       <parameter type-id='type-id-59' name='feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='343' column='1'/>
-      <parameter type-id='type-id-967' name='feature_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='344' column='1'/>
+      <parameter type-id='type-id-965' name='feature_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='344' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_get_feature_indexes' mangled-name='hb_ot_layout_language_get_feature_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_feature_indexes'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='358' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='358' column='1'/>
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='359' column='1'/>
       <parameter type-id='type-id-12' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='360' column='1'/>
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='361' column='1'/>
@@ -18997,27 +18990,27 @@
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_get_feature_tags' mangled-name='hb_ot_layout_language_get_feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_feature_tags'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='373' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='373' column='1'/>
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='374' column='1'/>
       <parameter type-id='type-id-12' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='375' column='1'/>
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='376' column='1'/>
       <parameter type-id='type-id-59' name='feature_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='377' column='1'/>
-      <parameter type-id='type-id-967' name='feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='378' column='1'/>
+      <parameter type-id='type-id-965' name='feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='378' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_find_feature' mangled-name='hb_ot_layout_language_find_feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_find_feature'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='398' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='398' column='1'/>
       <parameter type-id='type-id-12' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='399' column='1'/>
       <parameter type-id='type-id-12' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='400' column='1'/>
-      <parameter type-id='type-id-187' name='feature_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='401' column='1'/>
+      <parameter type-id='type-id-185' name='feature_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='401' column='1'/>
       <parameter type-id='type-id-59' name='feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='402' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_feature_get_lookups' mangled-name='hb_ot_layout_feature_get_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_feature_get_lookups'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='424' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='424' column='1'/>
       <parameter type-id='type-id-12' name='feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='425' column='1'/>
       <parameter type-id='type-id-12' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='426' column='1'/>
       <parameter type-id='type-id-59' name='lookup_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='427' column='1'/>
@@ -19025,35 +19018,35 @@
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_ot_layout_table_get_lookup_count' mangled-name='hb_ot_layout_table_get_lookup_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_lookup_count'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='438' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='438' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_ot_layout_collect_lookups' mangled-name='hb_ot_layout_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_collect_lookups'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
-      <parameter type-id='type-id-1804' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
-      <parameter type-id='type-id-1804' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
-      <parameter type-id='type-id-1804' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
-      <parameter type-id='type-id-960' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
+      <parameter type-id='type-id-1808' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
+      <parameter type-id='type-id-1808' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
+      <parameter type-id='type-id-1808' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
+      <parameter type-id='type-id-958' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_ot_layout_lookup_collect_glyphs' mangled-name='hb_ot_layout_lookup_collect_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_collect_glyphs'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='636' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='636' column='1'/>
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='637' column='1'/>
-      <parameter type-id='type-id-960' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
-      <parameter type-id='type-id-960' name='glyphs_input' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='639' column='1'/>
-      <parameter type-id='type-id-960' name='glyphs_after' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='640' column='1'/>
-      <parameter type-id='type-id-960' name='glyphs_output' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='641' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs_input' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='639' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs_after' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='640' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs_output' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='641' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_ot_layout_has_substitution' mangled-name='hb_ot_layout_has_substitution' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_substitution'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='674' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='674' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_lookup_would_substitute' mangled-name='hb_ot_layout_lookup_would_substitute' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_would_substitute'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1'/>
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='681' column='1'/>
       <parameter type-id='type-id-95' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='682' column='1'/>
       <parameter type-id='type-id-12' name='glyphs_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='683' column='1'/>
@@ -19061,17 +19054,17 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_lookup_substitute_closure' mangled-name='hb_ot_layout_lookup_substitute_closure' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_substitute_closure'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1'/>
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='719' column='1'/>
-      <parameter type-id='type-id-960' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='720' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='720' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_ot_layout_has_positioning' mangled-name='hb_ot_layout_has_positioning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_positioning'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='734' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='734' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_size_params' mangled-name='hb_ot_layout_get_size_params' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_size_params'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1'/>
       <parameter type-id='type-id-59' name='design_size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='753' column='1'/>
       <parameter type-id='type-id-59' name='subfamily_id' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='754' column='1'/>
       <parameter type-id='type-id-59' name='subfamily_name_id' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='755' column='1'/>
@@ -19079,10 +19072,15 @@
       <parameter type-id='type-id-59' name='range_end' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='757' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
-    <typedef-decl name='hb_void_t' type-id='type-id-982' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='259' column='1' id='type-id-1879'/>
-    <typedef-decl name='hb_set_digest_t' type-id='type-id-995' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-931'/>
+    <typedef-decl name='hb_void_t' type-id='type-id-980' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='259' column='1' id='type-id-1877'/>
+    <typedef-decl name='hb_set_digest_t' type-id='type-id-993' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-929'/>
+    <function-type size-in-bits='64' id='type-id-1396'>
+      <parameter type-id='type-id-1381'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-1853'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1398'>
-      <parameter type-id='type-id-960'/>
+      <parameter type-id='type-id-958'/>
       <parameter type-id='type-id-1763'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-1'/>
@@ -19093,56 +19091,51 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1807'>
-      <parameter type-id='type-id-1383'/>
+    <function-type size-in-bits='64' id='type-id-1784'>
+      <parameter type-id='type-id-1389'/>
       <parameter type-id='type-id-12'/>
-      <return type-id='type-id-1855'/>
+      <return type-id='type-id-1868'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1809'>
+    <function-type size-in-bits='64' id='type-id-1786'>
       <parameter type-id='type-id-1391'/>
       <parameter type-id='type-id-12'/>
-      <return type-id='type-id-1870'/>
+      <return type-id='type-id-1854'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1811'>
-      <parameter type-id='type-id-1393'/>
-      <parameter type-id='type-id-12'/>
-      <return type-id='type-id-1856'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1813'>
-      <parameter type-id='type-id-958'/>
+      <parameter type-id='type-id-956'/>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-145'/>
       <return type-id='type-id-23'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1814'>
-      <parameter type-id='type-id-960'/>
+    <function-type size-in-bits='64' id='type-id-1812'>
+      <parameter type-id='type-id-958'/>
       <parameter type-id='type-id-1763'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-23'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-1900' size-in-bits='7168' id='type-id-1901'>
-      <subrange length='32' type-id='type-id-4' id='type-id-921'/>
+    <array-type-def dimensions='1' type-id='type-id-1898' size-in-bits='7168' id='type-id-1899'>
+      <subrange length='32' type-id='type-id-4' id='type-id-919'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1902' size-in-bits='1024' id='type-id-1903'>
+    <array-type-def dimensions='1' type-id='type-id-1900' size-in-bits='1024' id='type-id-1901'>
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1904' size-in-bits='2304' id='type-id-1905'>
+    <array-type-def dimensions='1' type-id='type-id-1902' size-in-bits='2304' id='type-id-1903'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
     </array-type-def>
-    <enum-decl name='hb_ot_map_feature_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='155' column='1' id='type-id-1906'>
+    <enum-decl name='hb_ot_map_feature_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='155' column='1' id='type-id-1904'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='F_NONE' value='0'/>
       <enumerator name='F_GLOBAL' value='1'/>
       <enumerator name='F_HAS_FALLBACK' value='2'/>
       <enumerator name='F_MANUAL_ZWJ' value='4'/>
     </enum-decl>
-    <class-decl name='hb_ot_map_builder_t' size-in-bits='10240' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='181' column='1' id='type-id-1907'>
+    <class-decl name='hb_ot_map_builder_t' size-in-bits='10240' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='181' column='1' id='type-id-1905'>
       <member-type access='private'>
-        <class-decl name='feature_info_t' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='210' column='1' id='type-id-1900'>
+        <class-decl name='feature_info_t' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='210' column='1' id='type-id-1898'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='tag' type-id='type-id-187' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='211' column='1'/>
+            <var-decl name='tag' type-id='type-id-185' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='211' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='seq' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='212' column='1'/>
@@ -19151,7 +19144,7 @@
             <var-decl name='max_value' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='213' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='96'>
-            <var-decl name='flags' type-id='type-id-1906' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='214' column='1'/>
+            <var-decl name='flags' type-id='type-id-1904' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='214' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <var-decl name='default_value' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='215' column='1'/>
@@ -19161,34 +19154,34 @@
           </data-member>
           <member-function access='public' static='yes'>
             <function-decl name='cmp' mangled-name='_ZN19hb_ot_map_builder_t14feature_info_t3cmpEPKS0_S2_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1908'/>
-              <parameter type-id='type-id-1908'/>
+              <parameter type-id='type-id-1906'/>
+              <parameter type-id='type-id-1906'/>
               <return type-id='type-id-9'/>
             </function-decl>
           </member-function>
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <class-decl name='stage_info_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='222' column='1' id='type-id-1902'>
+        <class-decl name='stage_info_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='222' column='1' id='type-id-1900'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='index' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='223' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='pause_func' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='224' column='1'/>
+            <var-decl name='pause_func' type-id='type-id-950' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='224' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='231' column='1'/>
+        <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='231' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='props' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='232' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='chosen_script' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='234' column='1'/>
+        <var-decl name='chosen_script' type-id='type-id-926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='234' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='found_script' type-id='type-id-916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='235' column='1'/>
+        <var-decl name='found_script' type-id='type-id-914' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='235' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
         <var-decl name='script_index' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
@@ -19200,128 +19193,128 @@
         <var-decl name='current_stage' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='240' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <var-decl name='feature_infos' type-id='type-id-1909' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='241' column='1'/>
+        <var-decl name='feature_infos' type-id='type-id-1907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='241' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='7936'>
-        <var-decl name='stages' type-id='type-id-1905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='242' column='1'/>
+        <var-decl name='stages' type-id='type-id-1903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='242' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
+          <parameter type-id='type-id-173'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_gsub_pause' mangled-name='_ZN19hb_ot_map_builder_t14add_gsub_pauseEPFvPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-952'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-950'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_gpos_pause' mangled-name='_ZN19hb_ot_map_builder_t14add_gpos_pauseEPFvPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-952'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-950'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='add_pause' mangled-name='_ZN19hb_ot_map_builder_t9add_pauseEjPFvPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-952'/>
+          <parameter type-id='type-id-950'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_feature' mangled-name='_ZN19hb_ot_map_builder_t11add_featureEjj25hb_ot_map_feature_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-185'/>
           <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-1906'/>
+          <parameter type-id='type-id-1904'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='compile' mangled-name='_ZN19hb_ot_map_builder_t7compileER11hb_ot_map_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-1911'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-1909'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
+          <parameter type-id='type-id-173'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN19hb_ot_map_builder_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_global_bool_feature' mangled-name='_ZN19hb_ot_map_builder_t23add_global_bool_featureEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-185'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
+          <parameter type-id='type-id-173'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
+          <parameter type-id='type-id-173'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
+          <parameter type-id='type-id-173'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
+          <parameter type-id='type-id-173'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1910' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-175'/>
+          <parameter type-id='type-id-1908' is-artificial='yes'/>
+          <parameter type-id='type-id-160'/>
+          <parameter type-id='type-id-173'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1791'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1795'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='props' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='shaper' type-id='type-id-1816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
+        <var-decl name='shaper' type-id='type-id-1814' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='map' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='41' column='1'/>
+        <var-decl name='map' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
         <var-decl name='data' type-id='type-id-17' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='42' column='1'/>
@@ -19352,15 +19345,15 @@
       </data-member>
       <member-function access='public'>
         <function-decl name='collect_lookups' mangled-name='_ZNK18hb_ot_shape_plan_t15collect_lookupsEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-958' is-artificial='yes'/>
-          <parameter type-id='type-id-187'/>
-          <parameter type-id='type-id-960'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
+          <parameter type-id='type-id-185'/>
+          <parameter type-id='type-id-958'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='substitute' mangled-name='_ZNK18hb_ot_shape_plan_t10substituteEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-145'/>
           <return type-id='type-id-23'/>
@@ -19368,7 +19361,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='position' mangled-name='_ZNK18hb_ot_shape_plan_t8positionEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-958' is-artificial='yes'/>
+          <parameter type-id='type-id-956' is-artificial='yes'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-145'/>
           <return type-id='type-id-23'/>
@@ -19376,12 +19369,12 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN18hb_ot_shape_plan_t6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1817' is-artificial='yes'/>
+          <parameter type-id='type-id-1815' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_builder_t::feature_info_t, 32u&gt;' size-in-bits='7296' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-1909'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_builder_t::feature_info_t, 32u&gt;' size-in-bits='7296' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-1907'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
       </data-member>
@@ -19389,45 +19382,45 @@
         <var-decl name='allocated' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='array' type-id='type-id-1912' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-1910' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='static_array' type-id='type-id-1901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-1899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
-          <return type-id='type-id-1912'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
+          <return type-id='type-id-1910'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='qsort' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EE5qsortEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='operator[]' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-1914'/>
+          <return type-id='type-id-1912'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='shrink' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EE6shrinkEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t14feature_info_tELj32EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1913' is-artificial='yes'/>
+          <parameter type-id='type-id-1911' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_builder_t::stage_info_t, 8u&gt;' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-1904'>
+    <class-decl name='hb_prealloced_array_t&lt;hb_ot_map_builder_t::stage_info_t, 8u&gt;' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='329' column='1' id='type-id-1902'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='330' column='1'/>
       </data-member>
@@ -19435,194 +19428,194 @@
         <var-decl name='allocated' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='array' type-id='type-id-1915' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
+        <var-decl name='array' type-id='type-id-1913' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='static_array' type-id='type-id-1903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
+        <var-decl name='static_array' type-id='type-id-1901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='333' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='push' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t12stage_info_tELj8EE4pushEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1916' is-artificial='yes'/>
-          <return type-id='type-id-1915'/>
+          <parameter type-id='type-id-1914' is-artificial='yes'/>
+          <return type-id='type-id-1913'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='operator[]' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t12stage_info_tELj8EEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1916' is-artificial='yes'/>
+          <parameter type-id='type-id-1914' is-artificial='yes'/>
           <parameter type-id='type-id-12'/>
-          <return type-id='type-id-1917'/>
+          <return type-id='type-id-1915'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='finish' mangled-name='_ZN21hb_prealloced_array_tIN19hb_ot_map_builder_t12stage_info_tELj8EE6finishEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1916' is-artificial='yes'/>
+          <parameter type-id='type-id-1914' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
+    <qualified-type-def type-id='type-id-1898' const='yes' id='type-id-1916'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1916' size-in-bits='64' id='type-id-1917'/>
+    <pointer-type-def type-id='type-id-1916' size-in-bits='64' id='type-id-1906'/>
     <qualified-type-def type-id='type-id-1900' const='yes' id='type-id-1918'/>
     <reference-type-def kind='lvalue' type-id='type-id-1918' size-in-bits='64' id='type-id-1919'/>
-    <pointer-type-def type-id='type-id-1918' size-in-bits='64' id='type-id-1908'/>
-    <qualified-type-def type-id='type-id-1902' const='yes' id='type-id-1920'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1920' size-in-bits='64' id='type-id-1921'/>
-    <qualified-type-def type-id='type-id-1909' const='yes' id='type-id-1922'/>
+    <qualified-type-def type-id='type-id-1907' const='yes' id='type-id-1920'/>
+    <pointer-type-def type-id='type-id-1920' size-in-bits='64' id='type-id-1921'/>
+    <qualified-type-def type-id='type-id-1902' const='yes' id='type-id-1922'/>
     <pointer-type-def type-id='type-id-1922' size-in-bits='64' id='type-id-1923'/>
-    <qualified-type-def type-id='type-id-1904' const='yes' id='type-id-1924'/>
-    <pointer-type-def type-id='type-id-1924' size-in-bits='64' id='type-id-1925'/>
-    <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1910'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1900' size-in-bits='64' id='type-id-1914'/>
-    <pointer-type-def type-id='type-id-1900' size-in-bits='64' id='type-id-1912'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1902' size-in-bits='64' id='type-id-1917'/>
-    <pointer-type-def type-id='type-id-1902' size-in-bits='64' id='type-id-1915'/>
-    <reference-type-def kind='lvalue' type-id='type-id-949' size-in-bits='64' id='type-id-1911'/>
-    <pointer-type-def type-id='type-id-1909' size-in-bits='64' id='type-id-1913'/>
-    <pointer-type-def type-id='type-id-1904' size-in-bits='64' id='type-id-1916'/>
+    <pointer-type-def type-id='type-id-1905' size-in-bits='64' id='type-id-1908'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1898' size-in-bits='64' id='type-id-1912'/>
+    <pointer-type-def type-id='type-id-1898' size-in-bits='64' id='type-id-1910'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1900' size-in-bits='64' id='type-id-1915'/>
+    <pointer-type-def type-id='type-id-1900' size-in-bits='64' id='type-id-1913'/>
+    <reference-type-def kind='lvalue' type-id='type-id-947' size-in-bits='64' id='type-id-1909'/>
+    <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1911'/>
+    <pointer-type-def type-id='type-id-1902' size-in-bits='64' id='type-id-1914'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <reference-type-def kind='lvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-546'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-567'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1042' size-in-bits='64' id='type-id-565'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-551'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1128' size-in-bits='64' id='type-id-555'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-569'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1182' size-in-bits='64' id='type-id-572'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1314' size-in-bits='64' id='type-id-558'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1315' size-in-bits='64' id='type-id-562'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1744' size-in-bits='64' id='type-id-552'/>
-    <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-550'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1747' size-in-bits='64' id='type-id-556'/>
-    <pointer-type-def type-id='type-id-1747' size-in-bits='64' id='type-id-554'/>
-    <qualified-type-def type-id='type-id-543' const='yes' id='type-id-1926'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1926' size-in-bits='64' id='type-id-935'/>
-    <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-850'/>
-    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-1897'/>
-    <reference-type-def kind='lvalue' type-id='type-id-373' size-in-bits='64' id='type-id-573'/>
-    <qualified-type-def type-id='type-id-750' const='yes' id='type-id-1927'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1927' size-in-bits='64' id='type-id-851'/>
-    <pointer-type-def type-id='type-id-1927' size-in-bits='64' id='type-id-852'/>
-    <qualified-type-def type-id='type-id-1377' const='yes' id='type-id-1928'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1928' size-in-bits='64' id='type-id-1898'/>
-    <pointer-type-def type-id='type-id-1928' size-in-bits='64' id='type-id-1899'/>
-    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-1896'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1022' size-in-bits='64' id='type-id-544'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1039' size-in-bits='64' id='type-id-565'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-563'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1123' size-in-bits='64' id='type-id-549'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-553'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1164' size-in-bits='64' id='type-id-567'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1180' size-in-bits='64' id='type-id-570'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1312' size-in-bits='64' id='type-id-556'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1313' size-in-bits='64' id='type-id-560'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1744' size-in-bits='64' id='type-id-550'/>
+    <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-548'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1747' size-in-bits='64' id='type-id-554'/>
+    <pointer-type-def type-id='type-id-1747' size-in-bits='64' id='type-id-552'/>
+    <qualified-type-def type-id='type-id-541' const='yes' id='type-id-1924'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1924' size-in-bits='64' id='type-id-933'/>
+    <pointer-type-def type-id='type-id-748' size-in-bits='64' id='type-id-848'/>
+    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-1895'/>
+    <reference-type-def kind='lvalue' type-id='type-id-371' size-in-bits='64' id='type-id-571'/>
+    <qualified-type-def type-id='type-id-748' const='yes' id='type-id-1925'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1925' size-in-bits='64' id='type-id-849'/>
+    <pointer-type-def type-id='type-id-1925' size-in-bits='64' id='type-id-850'/>
+    <qualified-type-def type-id='type-id-1375' const='yes' id='type-id-1926'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1926' size-in-bits='64' id='type-id-1896'/>
+    <pointer-type-def type-id='type-id-1926' size-in-bits='64' id='type-id-1897'/>
+    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-1894'/>
     <namespace-decl name='OT'>
-      <class-decl name='AlternateSubst' is-struct='yes' visibility='default' id='type-id-1929'/>
-      <class-decl name='AlternateSubstFormat1' is-struct='yes' visibility='default' id='type-id-1930'/>
-      <class-decl name='ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1931'/>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1932'/>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1933'/>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1934'/>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1935'/>
-      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1936'/>
-      <class-decl name='ChainContext' is-struct='yes' visibility='default' id='type-id-1937'/>
-      <class-decl name='ChainContextFormat1' is-struct='yes' visibility='default' id='type-id-1938'/>
-      <class-decl name='ChainContextFormat2' is-struct='yes' visibility='default' id='type-id-1939'/>
-      <class-decl name='ChainContextFormat3' is-struct='yes' visibility='default' id='type-id-1940'/>
-      <class-decl name='Context' is-struct='yes' visibility='default' id='type-id-1941'/>
-      <class-decl name='ContextFormat1' is-struct='yes' visibility='default' id='type-id-1942'/>
-      <class-decl name='ContextFormat2' is-struct='yes' visibility='default' id='type-id-1943'/>
-      <class-decl name='ContextFormat3' is-struct='yes' visibility='default' id='type-id-1944'/>
-      <class-decl name='Coverage' is-struct='yes' visibility='default' id='type-id-1945'/>
-      <class-decl name='CoverageFormat1' is-struct='yes' visibility='default' id='type-id-1946'/>
-      <class-decl name='CoverageFormat2' is-struct='yes' visibility='default' id='type-id-1947'/>
-      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' is-struct='yes' visibility='default' id='type-id-1948'/>
-      <class-decl name='ExtensionFormat1' is-struct='yes' visibility='default' id='type-id-1949'/>
-      <class-decl name='GDEF' is-struct='yes' visibility='default' id='type-id-1950'/>
-      <class-decl name='HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1951'/>
-      <class-decl name='Ligature' is-struct='yes' visibility='default' id='type-id-1952'/>
-      <class-decl name='LigatureSet' is-struct='yes' visibility='default' id='type-id-1953'/>
-      <class-decl name='LigatureSubst' is-struct='yes' visibility='default' id='type-id-1954'/>
-      <class-decl name='LigatureSubstFormat1' is-struct='yes' visibility='default' id='type-id-1955'/>
-      <class-decl name='Lookup' is-struct='yes' visibility='default' id='type-id-1956'/>
-      <class-decl name='MultipleSubst' is-struct='yes' visibility='default' id='type-id-1957'/>
-      <class-decl name='MultipleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1958'/>
-      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1959'/>
-      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1960'/>
-      <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1961'/>
-      <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1962'/>
-      <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1963'/>
-      <class-decl name='RangeRecord' is-struct='yes' visibility='default' id='type-id-1964'/>
-      <class-decl name='ReverseChainSingleSubst' is-struct='yes' visibility='default' id='type-id-1965'/>
-      <class-decl name='ReverseChainSingleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1966'/>
-      <class-decl name='SingleSubst' is-struct='yes' visibility='default' id='type-id-1967'/>
-      <class-decl name='SingleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1968'/>
-      <class-decl name='SingleSubstFormat2' is-struct='yes' visibility='default' id='type-id-1969'/>
-      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1970'/>
-      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1971'/>
-      <class-decl name='SubstLookup' is-struct='yes' visibility='default' id='type-id-1972'/>
-      <class-decl name='SubstLookupSubTable' is-struct='yes' visibility='default' id='type-id-1973'/>
-      <class-decl name='hb_closure_context_t' is-struct='yes' visibility='default' id='type-id-1974'/>
-      <class-decl name='hb_collect_glyphs_context_t' is-struct='yes' visibility='default' id='type-id-1975'/>
-      <class-decl name='hb_get_coverage_context_t' is-struct='yes' visibility='default' id='type-id-1976'/>
-      <class-decl name='hb_would_apply_context_t' is-struct='yes' visibility='default' id='type-id-1977'/>
-      <class-decl name='Supplier&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-750'>
+      <class-decl name='AlternateSubst' is-struct='yes' visibility='default' id='type-id-1927'/>
+      <class-decl name='AlternateSubstFormat1' is-struct='yes' visibility='default' id='type-id-1928'/>
+      <class-decl name='ArrayOf&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1929'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1930'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1931'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1932'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1933'/>
+      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1934'/>
+      <class-decl name='ChainContext' is-struct='yes' visibility='default' id='type-id-1935'/>
+      <class-decl name='ChainContextFormat1' is-struct='yes' visibility='default' id='type-id-1936'/>
+      <class-decl name='ChainContextFormat2' is-struct='yes' visibility='default' id='type-id-1937'/>
+      <class-decl name='ChainContextFormat3' is-struct='yes' visibility='default' id='type-id-1938'/>
+      <class-decl name='Context' is-struct='yes' visibility='default' id='type-id-1939'/>
+      <class-decl name='ContextFormat1' is-struct='yes' visibility='default' id='type-id-1940'/>
+      <class-decl name='ContextFormat2' is-struct='yes' visibility='default' id='type-id-1941'/>
+      <class-decl name='ContextFormat3' is-struct='yes' visibility='default' id='type-id-1942'/>
+      <class-decl name='Coverage' is-struct='yes' visibility='default' id='type-id-1943'/>
+      <class-decl name='CoverageFormat1' is-struct='yes' visibility='default' id='type-id-1944'/>
+      <class-decl name='CoverageFormat2' is-struct='yes' visibility='default' id='type-id-1945'/>
+      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' is-struct='yes' visibility='default' id='type-id-1946'/>
+      <class-decl name='ExtensionFormat1' is-struct='yes' visibility='default' id='type-id-1947'/>
+      <class-decl name='GDEF' is-struct='yes' visibility='default' id='type-id-1948'/>
+      <class-decl name='HeadlessArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1949'/>
+      <class-decl name='Ligature' is-struct='yes' visibility='default' id='type-id-1950'/>
+      <class-decl name='LigatureSet' is-struct='yes' visibility='default' id='type-id-1951'/>
+      <class-decl name='LigatureSubst' is-struct='yes' visibility='default' id='type-id-1952'/>
+      <class-decl name='LigatureSubstFormat1' is-struct='yes' visibility='default' id='type-id-1953'/>
+      <class-decl name='Lookup' is-struct='yes' visibility='default' id='type-id-1954'/>
+      <class-decl name='MultipleSubst' is-struct='yes' visibility='default' id='type-id-1955'/>
+      <class-decl name='MultipleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1956'/>
+      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1957'/>
+      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1958'/>
+      <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1959'/>
+      <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1960'/>
+      <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1961'/>
+      <class-decl name='RangeRecord' is-struct='yes' visibility='default' id='type-id-1962'/>
+      <class-decl name='ReverseChainSingleSubst' is-struct='yes' visibility='default' id='type-id-1963'/>
+      <class-decl name='ReverseChainSingleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1964'/>
+      <class-decl name='SingleSubst' is-struct='yes' visibility='default' id='type-id-1965'/>
+      <class-decl name='SingleSubstFormat1' is-struct='yes' visibility='default' id='type-id-1966'/>
+      <class-decl name='SingleSubstFormat2' is-struct='yes' visibility='default' id='type-id-1967'/>
+      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1968'/>
+      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1969'/>
+      <class-decl name='SubstLookup' is-struct='yes' visibility='default' id='type-id-1970'/>
+      <class-decl name='SubstLookupSubTable' is-struct='yes' visibility='default' id='type-id-1971'/>
+      <class-decl name='hb_closure_context_t' is-struct='yes' visibility='default' id='type-id-1972'/>
+      <class-decl name='hb_collect_glyphs_context_t' is-struct='yes' visibility='default' id='type-id-1973'/>
+      <class-decl name='hb_get_coverage_context_t' is-struct='yes' visibility='default' id='type-id-1974'/>
+      <class-decl name='hb_would_apply_context_t' is-struct='yes' visibility='default' id='type-id-1975'/>
+      <class-decl name='Supplier&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-748'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='511' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='head' type-id='type-id-295' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
+          <var-decl name='head' type-id='type-id-293' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <parameter type-id='type-id-293'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
-            <parameter type-id='type-id-851'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <parameter type-id='type-id-849'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierINS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-852' is-artificial='yes'/>
+            <parameter type-id='type-id-850' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-293'/>
+            <return type-id='type-id-291'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='advance' mangled-name='_ZN2OT8SupplierINS_7IntTypeItLj2EEEE7advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Supplier&lt;unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-1377'>
+      <class-decl name='Supplier&lt;unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='487' column='1' id='type-id-1375'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='511' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='head' type-id='type-id-1896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
+          <var-decl name='head' type-id='type-id-1894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='512' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1896'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
+            <parameter type-id='type-id-1894'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Supplier' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1898'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
+            <parameter type-id='type-id-1896'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierIjEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-90'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='advance' mangled-name='_ZN2OT8SupplierIjE7advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1895' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-23'/>
           </function-decl>
@@ -19639,16 +19632,16 @@
   <abi-instr address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-92' size-in-bits='672' id='type-id-1978'>
-      <subrange length='21' type-id='type-id-4' id='type-id-1979'/>
+    <array-type-def dimensions='1' type-id='type-id-92' size-in-bits='672' id='type-id-1976'>
+      <subrange length='21' type-id='type-id-4' id='type-id-1977'/>
     </array-type-def>
-    <enum-decl name='base_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='276' column='1' id='type-id-1980'>
+    <enum-decl name='base_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='276' column='1' id='type-id-1978'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='BASE_POS_FIRST' value='0'/>
       <enumerator name='BASE_POS_LAST_SINHALA' value='1'/>
       <enumerator name='BASE_POS_LAST' value='2'/>
     </enum-decl>
-    <enum-decl name='reph_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='281' column='1' id='type-id-1981'>
+    <enum-decl name='reph_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='281' column='1' id='type-id-1979'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='REPH_POS_AFTER_MAIN' value='5'/>
       <enumerator name='REPH_POS_BEFORE_SUB' value='7'/>
@@ -19657,25 +19650,25 @@
       <enumerator name='REPH_POS_AFTER_POST' value='12'/>
       <enumerator name='REPH_POS_DONT_CARE' value='1'/>
     </enum-decl>
-    <enum-decl name='reph_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='289' column='1' id='type-id-1982'>
+    <enum-decl name='reph_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='289' column='1' id='type-id-1980'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='REPH_MODE_IMPLICIT' value='0'/>
       <enumerator name='REPH_MODE_EXPLICIT' value='1'/>
       <enumerator name='REPH_MODE_VIS_REPHA' value='2'/>
       <enumerator name='REPH_MODE_LOG_REPHA' value='3'/>
     </enum-decl>
-    <enum-decl name='blwf_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='295' column='1' id='type-id-1983'>
+    <enum-decl name='blwf_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='295' column='1' id='type-id-1981'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='BLWF_MODE_PRE_AND_POST' value='0'/>
       <enumerator name='BLWF_MODE_POST_ONLY' value='1'/>
     </enum-decl>
-    <enum-decl name='pref_len_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='299' column='1' id='type-id-1984'>
+    <enum-decl name='pref_len_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='299' column='1' id='type-id-1982'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='PREF_LEN_1' value='1'/>
       <enumerator name='PREF_LEN_2' value='2'/>
       <enumerator name='PREF_LEN_DONT_CARE' value='2'/>
     </enum-decl>
-    <class-decl name='indic_config_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='305' column='1' id='type-id-1985'>
+    <class-decl name='indic_config_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='305' column='1' id='type-id-1983'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='script' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='306' column='1'/>
       </data-member>
@@ -19686,24 +19679,24 @@
         <var-decl name='virama' type-id='type-id-64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='308' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='base_pos' type-id='type-id-1980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='309' column='1'/>
+        <var-decl name='base_pos' type-id='type-id-1978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reph_pos' type-id='type-id-1981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='310' column='1'/>
+        <var-decl name='reph_pos' type-id='type-id-1979' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='310' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='reph_mode' type-id='type-id-1982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='311' column='1'/>
+        <var-decl name='reph_mode' type-id='type-id-1980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='blwf_mode' type-id='type-id-1983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='312' column='1'/>
+        <var-decl name='blwf_mode' type-id='type-id-1981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='312' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='pref_len' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='313' column='1'/>
+        <var-decl name='pref_len' type-id='type-id-1982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='313' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='would_substitute_feature_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='481' column='1' id='type-id-1986'>
+    <class-decl name='would_substitute_feature_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='481' column='1' id='type-id-1984'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='lookups' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='501' column='1'/>
+        <var-decl name='lookups' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='501' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='502' column='1'/>
@@ -19713,26 +19706,26 @@
       </data-member>
       <member-function access='public'>
         <function-decl name='would_substitute' mangled-name='_ZNK26would_substitute_feature_t16would_substituteEPKjjP9hb_face_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1987' is-artificial='yes'/>
+          <parameter type-id='type-id-1985' is-artificial='yes'/>
           <parameter type-id='type-id-95'/>
           <parameter type-id='type-id-12'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-160'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN26would_substitute_feature_t4initEPK11hb_ot_map_tjb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1988' is-artificial='yes'/>
-          <parameter type-id='type-id-956'/>
-          <parameter type-id='type-id-187'/>
+          <parameter type-id='type-id-1986' is-artificial='yes'/>
+          <parameter type-id='type-id-954'/>
+          <parameter type-id='type-id-185'/>
           <parameter type-id='type-id-1'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='indic_shape_plan_t' size-in-bits='1344' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='507' column='1' id='type-id-1989'>
+    <class-decl name='indic_shape_plan_t' size-in-bits='1344' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='507' column='1' id='type-id-1987'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='config' type-id='type-id-1990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='529' column='1'/>
+        <var-decl name='config' type-id='type-id-1988' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='is_old_spec' type-id='type-id-1' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='531' column='1'/>
@@ -19741,36 +19734,36 @@
         <var-decl name='virama_glyph' type-id='type-id-64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='532' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='rphf' type-id='type-id-1986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='534' column='1'/>
+        <var-decl name='rphf' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='pref' type-id='type-id-1986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='535' column='1'/>
+        <var-decl name='pref' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='535' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='blwf' type-id='type-id-1986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='536' column='1'/>
+        <var-decl name='blwf' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='pstf' type-id='type-id-1986' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='537' column='1'/>
+        <var-decl name='pstf' type-id='type-id-1984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='mask_array' type-id='type-id-1978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='539' column='1'/>
+        <var-decl name='mask_array' type-id='type-id-1976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='539' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='get_virama_glyph' mangled-name='_ZNK18indic_shape_plan_t16get_virama_glyphEP9hb_font_tPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='510' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-1991' is-artificial='yes'/>
+          <parameter type-id='type-id-1989' is-artificial='yes'/>
           <parameter type-id='type-id-147'/>
           <parameter type-id='type-id-127'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-1985' const='yes' id='type-id-1992'/>
-    <pointer-type-def type-id='type-id-1992' size-in-bits='64' id='type-id-1990'/>
-    <qualified-type-def type-id='type-id-1989' const='yes' id='type-id-1993'/>
-    <pointer-type-def type-id='type-id-1993' size-in-bits='64' id='type-id-1991'/>
-    <qualified-type-def type-id='type-id-1986' const='yes' id='type-id-1994'/>
-    <pointer-type-def type-id='type-id-1994' size-in-bits='64' id='type-id-1987'/>
-    <pointer-type-def type-id='type-id-1986' size-in-bits='64' id='type-id-1988'/>
+    <qualified-type-def type-id='type-id-1983' const='yes' id='type-id-1990'/>
+    <pointer-type-def type-id='type-id-1990' size-in-bits='64' id='type-id-1988'/>
+    <qualified-type-def type-id='type-id-1987' const='yes' id='type-id-1991'/>
+    <pointer-type-def type-id='type-id-1991' size-in-bits='64' id='type-id-1989'/>
+    <qualified-type-def type-id='type-id-1984' const='yes' id='type-id-1992'/>
+    <pointer-type-def type-id='type-id-1992' size-in-bits='64' id='type-id-1985'/>
+    <pointer-type-def type-id='type-id-1984' size-in-bits='64' id='type-id-1986'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
   </abi-instr>
@@ -19782,21 +19775,21 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1995'/>
-      <class-decl name='MarkGlyphSets' is-struct='yes' visibility='default' id='type-id-1996'/>
-      <class-decl name='MarkGlyphSetsFormat1' is-struct='yes' visibility='default' id='type-id-1997'/>
-      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1998'/>
-      <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1999'/>
-      <class-decl name='Coverage' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2000'/>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1993'/>
+      <class-decl name='MarkGlyphSets' is-struct='yes' visibility='default' id='type-id-1994'/>
+      <class-decl name='MarkGlyphSetsFormat1' is-struct='yes' visibility='default' id='type-id-1995'/>
+      <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1996'/>
+      <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' is-struct='yes' visibility='default' id='type-id-1997'/>
+      <class-decl name='Coverage' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1998'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-2001'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-1999'>
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
     </array-type-def>
-    <enum-decl name='hb_ot_shape_zero_width_marks_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='42' column='1' id='type-id-2002'>
+    <enum-decl name='hb_ot_shape_zero_width_marks_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='42' column='1' id='type-id-2000'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE' value='0'/>
       <enumerator name='HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE' value='1'/>
@@ -19804,45 +19797,45 @@
       <enumerator name='HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE' value='3'/>
       <enumerator name='HB_OT_SHAPE_ZERO_WIDTH_MARKS_DEFAULT' value='1'/>
     </enum-decl>
-    <class-decl name='hb_ot_complex_shaper_t' size-in-bits='704' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='69' column='1' id='type-id-2003'>
+    <class-decl name='hb_ot_complex_shaper_t' size-in-bits='704' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='69' column='1' id='type-id-2001'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-2001' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='70' column='1'/>
+        <var-decl name='name' type-id='type-id-1999' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='collect_features' type-id='type-id-2004' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='77' column='1'/>
+        <var-decl name='collect_features' type-id='type-id-2002' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='override_features' type-id='type-id-2004' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='85' column='1'/>
+        <var-decl name='override_features' type-id='type-id-2002' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='data_create' type-id='type-id-2005' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='93' column='1'/>
+        <var-decl name='data_create' type-id='type-id-2003' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='data_destroy' type-id='type-id-61' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='preprocess_text' type-id='type-id-2006' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='111' column='1'/>
+        <var-decl name='preprocess_text' type-id='type-id-2004' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='normalization_preference' type-id='type-id-2007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='114' column='1'/>
+        <var-decl name='normalization_preference' type-id='type-id-2005' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='decompose' type-id='type-id-2008' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='123' column='1'/>
+        <var-decl name='decompose' type-id='type-id-2006' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='compose' type-id='type-id-2009' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='132' column='1'/>
+        <var-decl name='compose' type-id='type-id-2007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='setup_masks' type-id='type-id-2006' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='142' column='1'/>
+        <var-decl name='setup_masks' type-id='type-id-2004' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='zero_width_marks' type-id='type-id-2002' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='144' column='1'/>
+        <var-decl name='zero_width_marks' type-id='type-id-2000' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
         <var-decl name='fallback_position' type-id='type-id-1' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='146' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='hb_ot_shape_normalization_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='38' column='1' id='type-id-2007'>
+    <enum-decl name='hb_ot_shape_normalization_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='38' column='1' id='type-id-2005'>
       <underlying-type type-id='type-id-11'/>
       <enumerator name='HB_OT_SHAPE_NORMALIZATION_MODE_NONE' value='0'/>
       <enumerator name='HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED' value='1'/>
@@ -19850,9 +19843,9 @@
       <enumerator name='HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT' value='3'/>
       <enumerator name='HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT' value='2'/>
     </enum-decl>
-    <class-decl name='hb_ot_shape_normalize_context_t' size-in-bits='384' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='53' column='1' id='type-id-2010'>
+    <class-decl name='hb_ot_shape_normalize_context_t' size-in-bits='384' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='53' column='1' id='type-id-2008'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='plan' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='54' column='1'/>
+        <var-decl name='plan' type-id='type-id-956' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='buffer' type-id='type-id-145' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
@@ -19864,142 +19857,142 @@
         <var-decl name='unicode' type-id='type-id-84' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='decompose' type-id='type-id-2008' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
+        <var-decl name='decompose' type-id='type-id-2006' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='compose' type-id='type-id-2009' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
+        <var-decl name='compose' type-id='type-id-2007' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_ot_shape_planner_t' size-in-bits='10624' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='66' column='1' id='type-id-2011'>
+    <class-decl name='hb_ot_shape_planner_t' size-in-bits='10624' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='66' column='1' id='type-id-2009'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='face' type-id='type-id-162' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='68' column='1'/>
+        <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='props' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='shaper' type-id='type-id-1816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='70' column='1'/>
+        <var-decl name='shaper' type-id='type-id-1814' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='map' type-id='type-id-1907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='71' column='1'/>
+        <var-decl name='map' type-id='type-id-1905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='71' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_shape_planner_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2012' is-artificial='yes'/>
-          <parameter type-id='type-id-2013'/>
+          <parameter type-id='type-id-2010' is-artificial='yes'/>
+          <parameter type-id='type-id-2011'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~hb_ot_shape_planner_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2012' is-artificial='yes'/>
+          <parameter type-id='type-id-2010' is-artificial='yes'/>
           <parameter type-id='type-id-9' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='hb_ot_shape_planner_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2012' is-artificial='yes'/>
-          <parameter type-id='type-id-2014'/>
+          <parameter type-id='type-id-2010' is-artificial='yes'/>
+          <parameter type-id='type-id-2012'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='compile' mangled-name='_ZN21hb_ot_shape_planner_t7compileER18hb_ot_shape_plan_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2012' is-artificial='yes'/>
-          <parameter type-id='type-id-2015'/>
+          <parameter type-id='type-id-2010' is-artificial='yes'/>
+          <parameter type-id='type-id-2013'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-2016' size-in-bits='64' id='type-id-2008'/>
-    <pointer-type-def type-id='type-id-2017' size-in-bits='64' id='type-id-2009'/>
-    <qualified-type-def type-id='type-id-2003' const='yes' id='type-id-2018'/>
-    <pointer-type-def type-id='type-id-2018' size-in-bits='64' id='type-id-1816'/>
-    <qualified-type-def type-id='type-id-2010' const='yes' id='type-id-2019'/>
-    <pointer-type-def type-id='type-id-2019' size-in-bits='64' id='type-id-2020'/>
-    <qualified-type-def type-id='type-id-2011' const='yes' id='type-id-2021'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2021' size-in-bits='64' id='type-id-2014'/>
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-2022'/>
-    <pointer-type-def type-id='type-id-2022' size-in-bits='64' id='type-id-2013'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1791' size-in-bits='64' id='type-id-2015'/>
-    <pointer-type-def type-id='type-id-1791' size-in-bits='64' id='type-id-1817'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2011' size-in-bits='64' id='type-id-2023'/>
-    <pointer-type-def type-id='type-id-2011' size-in-bits='64' id='type-id-2012'/>
-    <pointer-type-def type-id='type-id-2024' size-in-bits='64' id='type-id-2006'/>
-    <pointer-type-def type-id='type-id-2025' size-in-bits='64' id='type-id-2004'/>
-    <pointer-type-def type-id='type-id-2026' size-in-bits='64' id='type-id-2005'/>
+    <pointer-type-def type-id='type-id-2014' size-in-bits='64' id='type-id-2006'/>
+    <pointer-type-def type-id='type-id-2015' size-in-bits='64' id='type-id-2007'/>
+    <qualified-type-def type-id='type-id-2001' const='yes' id='type-id-2016'/>
+    <pointer-type-def type-id='type-id-2016' size-in-bits='64' id='type-id-1814'/>
+    <qualified-type-def type-id='type-id-2008' const='yes' id='type-id-2017'/>
+    <pointer-type-def type-id='type-id-2017' size-in-bits='64' id='type-id-2018'/>
+    <qualified-type-def type-id='type-id-2009' const='yes' id='type-id-2019'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2019' size-in-bits='64' id='type-id-2012'/>
+    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-2020'/>
+    <pointer-type-def type-id='type-id-2020' size-in-bits='64' id='type-id-2011'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1795' size-in-bits='64' id='type-id-2013'/>
+    <pointer-type-def type-id='type-id-1795' size-in-bits='64' id='type-id-1815'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2009' size-in-bits='64' id='type-id-2021'/>
+    <pointer-type-def type-id='type-id-2009' size-in-bits='64' id='type-id-2010'/>
+    <pointer-type-def type-id='type-id-2022' size-in-bits='64' id='type-id-2004'/>
+    <pointer-type-def type-id='type-id-2023' size-in-bits='64' id='type-id-2002'/>
+    <pointer-type-def type-id='type-id-2024' size-in-bits='64' id='type-id-2003'/>
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1'/>
-      <parameter type-id='type-id-187' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='741' column='1'/>
-      <parameter type-id='type-id-960' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='742' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1'/>
+      <parameter type-id='type-id-185' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='741' column='1'/>
+      <parameter type-id='type-id-958' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='742' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_ot_shape_glyphs_closure' mangled-name='hb_ot_shape_glyphs_closure' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_glyphs_closure'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
-      <parameter type-id='type-id-336' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
+      <parameter type-id='type-id-334' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='773' column='1'/>
-      <parameter type-id='type-id-960' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
+      <parameter type-id='type-id-958' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-2016'>
-      <parameter type-id='type-id-2020'/>
+    <function-type size-in-bits='64' id='type-id-2014'>
+      <parameter type-id='type-id-2018'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2017'>
-      <parameter type-id='type-id-2020'/>
+    <function-type size-in-bits='64' id='type-id-2015'>
+      <parameter type-id='type-id-2018'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2024'>
-      <parameter type-id='type-id-958'/>
+    <function-type size-in-bits='64' id='type-id-2022'>
+      <parameter type-id='type-id-956'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-147'/>
       <return type-id='type-id-23'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2025'>
-      <parameter type-id='type-id-2012'/>
+    <function-type size-in-bits='64' id='type-id-2023'>
+      <parameter type-id='type-id-2010'/>
       <return type-id='type-id-23'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2026'>
-      <parameter type-id='type-id-958'/>
+    <function-type size-in-bits='64' id='type-id-2024'>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-17'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-965'/>
     <function-decl name='hb_ot_tags_from_script' mangled-name='hb_ot_tags_from_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tags_from_script'>
       <parameter type-id='type-id-106' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1'/>
-      <parameter type-id='type-id-967' name='script_tag_1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='131' column='1'/>
-      <parameter type-id='type-id-967' name='script_tag_2' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='132' column='1'/>
+      <parameter type-id='type-id-965' name='script_tag_1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='131' column='1'/>
+      <parameter type-id='type-id-965' name='script_tag_2' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='132' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_ot_tag_to_script' mangled-name='hb_ot_tag_to_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_script'>
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='147' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='147' column='1'/>
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='hb_ot_tag_from_language' mangled-name='hb_ot_tag_from_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_from_language'>
       <parameter type-id='type-id-107' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1'/>
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-185'/>
     </function-decl>
     <function-decl name='hb_ot_tag_to_language' mangled-name='hb_ot_tag_to_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_language'>
-      <parameter type-id='type-id-187' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1'/>
+      <parameter type-id='type-id-185' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1'/>
       <return type-id='type-id-107'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2027' size-in-bits='65536' id='type-id-2028'>
-      <subrange length='2048' type-id='type-id-4' id='type-id-2029'/>
+    <array-type-def dimensions='1' type-id='type-id-2025' size-in-bits='65536' id='type-id-2026'>
+      <subrange length='2048' type-id='type-id-4' id='type-id-2027'/>
     </array-type-def>
-    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-2030'>
+    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-2028'>
       <member-type access='public'>
-        <typedef-decl name='elt_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-2027'/>
+        <typedef-decl name='elt_t' type-id='type-id-100' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-2025'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='148' column='1'/>
@@ -20026,57 +20019,57 @@
         <var-decl name='INVALID' type-id='type-id-130' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='elts' type-id='type-id-2028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
+        <var-decl name='elts' type-id='type-id-2026' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='is_equal' mangled-name='_ZNK8hb_set_t8is_equalEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
+          <parameter type-id='type-id-2029'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_min' mangled-name='_ZNK8hb_set_t7get_minEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <return type-id='type-id-64'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_max' mangled-name='_ZNK8hb_set_t7get_maxEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <return type-id='type-id-64'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='is_empty' mangled-name='_ZNK8hb_set_t8is_emptyEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='elt' mangled-name='_ZNK8hb_set_t3eltEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <return type-id='type-id-2027'/>
+          <return type-id='type-id-2025'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='mask' mangled-name='_ZNK8hb_set_t4maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <return type-id='type-id-2027'/>
+          <return type-id='type-id-2025'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='has' mangled-name='_ZNK8hb_set_t3hasEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='next_range' mangled-name='_ZNK8hb_set_t10next_rangeEPjS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <parameter type-id='type-id-127'/>
           <parameter type-id='type-id-127'/>
           <return type-id='type-id-1'/>
@@ -20084,62 +20077,62 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='invert' mangled-name='_ZN8hb_set_t6invertEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='symmetric_difference' mangled-name='_ZN8hb_set_t20symmetric_differenceEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
+          <parameter type-id='type-id-2029'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='subtract' mangled-name='_ZN8hb_set_t8subtractEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
+          <parameter type-id='type-id-2029'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='intersect' mangled-name='_ZN8hb_set_t9intersectEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
+          <parameter type-id='type-id-2029'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='union_' mangled-name='_ZN8hb_set_t6union_EPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
+          <parameter type-id='type-id-2029'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='set' mangled-name='_ZN8hb_set_t3setEPKS_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
-          <parameter type-id='type-id-2031'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
+          <parameter type-id='type-id-2029'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='elt' mangled-name='_ZN8hb_set_t3eltEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
-          <return type-id='type-id-2033'/>
+          <return type-id='type-id-2031'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='del' mangled-name='_ZN8hb_set_t3delEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='del_range' mangled-name='_ZN8hb_set_t9del_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-23'/>
@@ -20147,14 +20140,14 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='add' mangled-name='_ZN8hb_set_t3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_range' mangled-name='_ZN8hb_set_t9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-23'/>
@@ -20162,32 +20155,32 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_population' mangled-name='_ZNK8hb_set_t14get_populationEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clear' mangled-name='_ZN8hb_set_t5clearEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='fini' mangled-name='_ZN8hb_set_t4finiEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='next' mangled-name='_ZNK8hb_set_t4nextEPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <parameter type-id='type-id-127'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='intersects' mangled-name='_ZNK8hb_set_t10intersectsEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2031' is-artificial='yes'/>
+          <parameter type-id='type-id-2029' is-artificial='yes'/>
           <parameter type-id='type-id-64'/>
           <parameter type-id='type-id-64'/>
           <return type-id='type-id-1'/>
@@ -20195,34 +20188,34 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN8hb_set_t4initEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-2032' is-artificial='yes'/>
+          <parameter type-id='type-id-2030' is-artificial='yes'/>
           <return type-id='type-id-23'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-2030' const='yes' id='type-id-2034'/>
-    <qualified-type-def type-id='type-id-1882' const='yes' id='type-id-2035'/>
-    <pointer-type-def type-id='type-id-2034' size-in-bits='64' id='type-id-2031'/>
-    <pointer-type-def type-id='type-id-2035' size-in-bits='64' id='type-id-1842'/>
-    <pointer-type-def type-id='type-id-2030' size-in-bits='64' id='type-id-2032'/>
-    <pointer-type-def type-id='type-id-1882' size-in-bits='64' id='type-id-960'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2027' size-in-bits='64' id='type-id-2033'/>
+    <qualified-type-def type-id='type-id-2028' const='yes' id='type-id-2032'/>
+    <qualified-type-def type-id='type-id-1880' const='yes' id='type-id-2033'/>
+    <pointer-type-def type-id='type-id-2032' size-in-bits='64' id='type-id-2029'/>
+    <pointer-type-def type-id='type-id-2033' size-in-bits='64' id='type-id-1840'/>
+    <pointer-type-def type-id='type-id-2028' size-in-bits='64' id='type-id-2030'/>
+    <pointer-type-def type-id='type-id-1880' size-in-bits='64' id='type-id-958'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2025' size-in-bits='64' id='type-id-2031'/>
     <function-decl name='hb_set_create' mangled-name='hb_set_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_create'>
-      <return type-id='type-id-960'/>
+      <return type-id='type-id-958'/>
     </function-decl>
     <function-decl name='hb_set_get_empty' mangled-name='hb_set_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_empty'>
-      <return type-id='type-id-960'/>
+      <return type-id='type-id-958'/>
     </function-decl>
     <function-decl name='hb_set_reference' mangled-name='hb_set_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_reference'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1'/>
-      <return type-id='type-id-960'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1'/>
+      <return type-id='type-id-958'/>
     </function-decl>
     <function-decl name='hb_set_destroy' mangled-name='hb_set_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_destroy'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='94' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='94' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_set_user_data' mangled-name='hb_set_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_set_user_data'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1'/>
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='117' column='1'/>
       <parameter type-id='type-id-17' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='118' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='119' column='1'/>
@@ -20230,130 +20223,130 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_set_get_user_data' mangled-name='hb_set_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_user_data'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1'/>
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='136' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='hb_set_allocation_successful' mangled-name='hb_set_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_allocation_successful'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_set_clear' mangled-name='hb_set_clear' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_clear'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='167' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='167' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_is_empty' mangled-name='hb_set_is_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_is_empty'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='183' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='183' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_set_has' mangled-name='hb_set_has' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_has'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1'/>
       <parameter type-id='type-id-64' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='201' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_set_add' mangled-name='hb_set_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_add'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='216' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='216' column='1'/>
       <parameter type-id='type-id-64' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='217' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_add_range' mangled-name='hb_set_add_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_add_range'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='233' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='233' column='1'/>
       <parameter type-id='type-id-64' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='234' column='1'/>
       <parameter type-id='type-id-64' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='235' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_del' mangled-name='hb_set_del' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_del'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
       <parameter type-id='type-id-64' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_del_range' mangled-name='hb_set_del_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_del_range'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
       <parameter type-id='type-id-64' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='268' column='1'/>
       <parameter type-id='type-id-64' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_is_equal' mangled-name='hb_set_is_equal' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='286' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_is_equal'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='286' column='1'/>
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='287' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='286' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='287' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_set_set' mangled-name='hb_set_set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_set'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='302' column='1'/>
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='303' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='302' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='303' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_union' mangled-name='hb_set_union' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_union'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='318' column='1'/>
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='319' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='318' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='319' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_intersect' mangled-name='hb_set_intersect' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_intersect'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='334' column='1'/>
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='335' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='334' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='335' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_subtract' mangled-name='hb_set_subtract' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_subtract'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='350' column='1'/>
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='351' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='350' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='351' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_symmetric_difference' mangled-name='hb_set_symmetric_difference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_symmetric_difference'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
-      <parameter type-id='type-id-1842' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-1840' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_invert' mangled-name='hb_set_invert' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_invert'>
-      <parameter type-id='type-id-960' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
+      <parameter type-id='type-id-958' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_set_get_population' mangled-name='hb_set_get_population' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_population'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_set_get_min' mangled-name='hb_set_get_min' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_min'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1'/>
       <return type-id='type-id-64'/>
     </function-decl>
     <function-decl name='hb_set_get_max' mangled-name='hb_set_get_max' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_max'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='429' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='429' column='1'/>
       <return type-id='type-id-64'/>
     </function-decl>
     <function-decl name='hb_set_next' mangled-name='hb_set_next' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_next'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1'/>
       <parameter type-id='type-id-127' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='447' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_set_next_range' mangled-name='hb_set_next_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_next_range'>
-      <parameter type-id='type-id-1842' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1'/>
+      <parameter type-id='type-id-1840' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1'/>
       <parameter type-id='type-id-127' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='467' column='1'/>
       <parameter type-id='type-id-127' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='468' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
-    <typedef-decl name='hb_set_t' type-id='type-id-2030' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1882'/>
+    <typedef-decl name='hb_set_t' type-id='type-id-2028' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1880'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-shape-plan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <function-decl name='hb_shape_plan_create' mangled-name='hb_shape_plan_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_create'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
-      <parameter type-id='type-id-175' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='113' column='1'/>
-      <parameter type-id='type-id-336' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='114' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
+      <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='113' column='1'/>
+      <parameter type-id='type-id-334' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='114' column='1'/>
       <parameter type-id='type-id-12' name='num_user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='115' column='1'/>
-      <parameter type-id='type-id-2036' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='116' column='1'/>
-      <return type-id='type-id-195'/>
+      <parameter type-id='type-id-2034' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='116' column='1'/>
+      <return type-id='type-id-193'/>
     </function-decl>
     <function-decl name='hb_shape_plan_get_empty' mangled-name='hb_shape_plan_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_empty'>
-      <return type-id='type-id-195'/>
+      <return type-id='type-id-193'/>
     </function-decl>
     <function-decl name='hb_shape_plan_reference' mangled-name='hb_shape_plan_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_reference'>
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='200' column='1'/>
-      <return type-id='type-id-195'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='200' column='1'/>
+      <return type-id='type-id-193'/>
     </function-decl>
     <function-decl name='hb_shape_plan_destroy' mangled-name='hb_shape_plan_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_destroy'>
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='214' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='214' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='hb_shape_plan_set_user_data' mangled-name='hb_shape_plan_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_set_user_data'>
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='242' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='242' column='1'/>
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='243' column='1'/>
       <parameter type-id='type-id-17' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='244' column='1'/>
       <parameter type-id='type-id-18' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='245' column='1'/>
@@ -20361,42 +20354,42 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_shape_plan_get_user_data' mangled-name='hb_shape_plan_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_user_data'>
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='263' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='263' column='1'/>
       <parameter type-id='type-id-29' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='264' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='hb_shape_plan_execute' mangled-name='hb_shape_plan_execute' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_execute'>
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1'/>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='286' column='1'/>
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='287' column='1'/>
-      <parameter type-id='type-id-336' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='288' column='1'/>
+      <parameter type-id='type-id-334' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='288' column='1'/>
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='289' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_shape_plan_create_cached' mangled-name='hb_shape_plan_create_cached' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_create_cached'>
-      <parameter type-id='type-id-162' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='402' column='1'/>
-      <parameter type-id='type-id-175' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='403' column='1'/>
-      <parameter type-id='type-id-336' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='404' column='1'/>
+      <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='402' column='1'/>
+      <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='403' column='1'/>
+      <parameter type-id='type-id-334' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='404' column='1'/>
       <parameter type-id='type-id-12' name='num_user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='405' column='1'/>
-      <parameter type-id='type-id-2036' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='406' column='1'/>
-      <return type-id='type-id-195'/>
+      <parameter type-id='type-id-2034' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='406' column='1'/>
+      <return type-id='type-id-193'/>
     </function-decl>
     <function-decl name='hb_shape_plan_get_shaper' mangled-name='hb_shape_plan_get_shaper' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_shaper'>
-      <parameter type-id='type-id-195' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='489' column='1'/>
+      <parameter type-id='type-id-193' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='489' column='1'/>
       <return type-id='type-id-15'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-15' const='yes' id='type-id-2037'/>
-    <pointer-type-def type-id='type-id-2037' size-in-bits='64' id='type-id-2036'/>
+    <qualified-type-def type-id='type-id-15' const='yes' id='type-id-2035'/>
+    <pointer-type-def type-id='type-id-2035' size-in-bits='64' id='type-id-2034'/>
     <function-decl name='hb_feature_from_string' mangled-name='hb_feature_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_feature_from_string'>
       <parameter type-id='type-id-15' name='str' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='212' column='1'/>
       <parameter type-id='type-id-9' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='212' column='1'/>
-      <parameter type-id='type-id-219' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='213' column='1'/>
+      <parameter type-id='type-id-217' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='213' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_feature_to_string' mangled-name='hb_feature_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_feature_to_string'>
-      <parameter type-id='type-id-219' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1'/>
+      <parameter type-id='type-id-217' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1'/>
       <parameter type-id='type-id-45' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='244' column='1'/>
       <parameter type-id='type-id-12' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='244' column='1'/>
       <return type-id='type-id-23'/>
@@ -20407,15 +20400,15 @@
     <function-decl name='hb_shape_full' mangled-name='hb_shape_full' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_full'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
-      <parameter type-id='type-id-336' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
+      <parameter type-id='type-id-334' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='350' column='1'/>
-      <parameter type-id='type-id-2036' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='351' column='1'/>
+      <parameter type-id='type-id-2034' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='351' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='hb_shape' mangled-name='hb_shape' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape'>
       <parameter type-id='type-id-147' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
       <parameter type-id='type-id-145' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
-      <parameter type-id='type-id-336' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
+      <parameter type-id='type-id-334' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='382' column='1'/>
       <return type-id='type-id-23'/>
     </function-decl>

diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index ffd24c69a10c920774ad6a277bcdba5bccecdc8b..302328605a40afbd18b650f72f7e2a74bea9b3c4 100644 (file)
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -5662,16 +5662,16 @@
     <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-347'/>
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-381'/>
     <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-418'/>
-    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-348'/>
+    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-372'/>
+    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-332'/>
     <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-364'/>
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-267'/>
-    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-380'/>
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-422'/>
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-423'/>
+    <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-423'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-424'/>
     <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
     <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-348'/>
     <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-234'/>
     <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-259'/>
     <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-251'/>
@@ -5687,8 +5687,8 @@
     <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-415'/>
     <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-401'/>
     <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-416'/>
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-419'/>
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-421'/>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-420'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-422'/>
     <typedef-decl name='uchar' type-id='type-id-29' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-408'/>
     <typedef-decl name='cpp_reader' type-id='type-id-375' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-414'/>
     <typedef-decl name='cpp_buffer' type-id='type-id-369' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-410'/>
@@ -5792,12 +5792,12 @@
     <typedef-decl name='dev_t' type-id='type-id-83' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-342'/>
     <typedef-decl name='time_t' type-id='type-id-99' filepath='/usr/include/time.h' line='76' column='1' id='type-id-403'/>
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-422'/>
+      <parameter type-id='type-id-423'/>
       <return type-id='type-id-403'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-405'/>
-      <return type-id='type-id-423'/>
+      <return type-id='type-id-424'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-407'/>
@@ -5841,16 +5841,16 @@
       <parameter type-id='type-id-231'/>
       <return type-id='type-id-233'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-420'>
+    <function-type size-in-bits='64' id='type-id-419'>
+      <parameter type-id='type-id-285'/>
+      <return type-id='type-id-288'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-421'>
       <parameter type-id='type-id-225'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-424'>
-      <parameter type-id='type-id-285'/>
-      <return type-id='type-id-288'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-425'>
       <parameter type-id='type-id-225'/>
       <parameter type-id='type-id-1'/>
@@ -6938,10 +6938,10 @@
     <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-495'/>
     <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-497'/>
     <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-499'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-498'/>
     <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-144'/>
-    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-143'/>
-    <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-496'/>
-    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-143'/>
     <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-501'/>
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
       <parameter type-id='type-id-2' name='flags' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
@@ -6984,7 +6984,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-511'/>
-    <typedef-decl name='pid_t' type-id='type-id-511' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-507'/>
+    <typedef-decl name='pid_t' type-id='type-id-511' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-509'/>
     <function-type size-in-bits='64' id='type-id-502'>
       <parameter type-id='type-id-121'/>
       <parameter type-id='type-id-2'/>
@@ -7008,7 +7008,7 @@
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-508'>
+    <function-type size-in-bits='64' id='type-id-507'>
       <parameter type-id='type-id-121'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-1'/>
@@ -7020,17 +7020,17 @@
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-243'/>
       <parameter type-id='type-id-51'/>
-      <return type-id='type-id-507'/>
+      <return type-id='type-id-509'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-509'>
+    <function-type size-in-bits='64' id='type-id-508'>
       <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-507'/>
+      <parameter type-id='type-id-509'/>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-144'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-243'/>
       <parameter type-id='type-id-51'/>
-      <return type-id='type-id-507'/>
+      <return type-id='type-id-509'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-510'>
       <parameter type-id='type-id-121'/>

diff --git a/tests/test-alt-dwarf-file.cc b/tests/test-alt-dwarf-file.cc
index fbd0aaae79b484786110cd59d583db9c59b40689..ddd4f9cf0a38787b690906da1484918040431105 100644 (file)
--- a/tests/test-alt-dwarf-file.cc
+++ b/tests/test-alt-dwarf-file.cc
@@ -60,6 +60,13 @@ InOutSpec in_out_specs[] =
     "data/test-alt-dwarf-file/rhbz1951526/rhbz1951526-report-0.txt",
     "output/test-alt-dwarf-file/rhbz1951526/rhbz1951526-report-0.txt"
   },
+  {
+    "data/test-alt-dwarf-file/libstdc++/usr/lib64/libstdc++.so.6.0.30",
+    "data/test-alt-dwarf-file/libstdc++/usr/lib/debug",
+    "--abidiff",
+    "data/test-alt-dwarf-file/libstdc++/libstdc++-report.txt",
+    "output/test-alt-dwarf-file/libstdc++/libstdc++-report.txt"
+  },
 
   // This should always be the last entry
   {NULL, NULL, NULL, NULL, NULL}