diff mbox series

Use generic internal type name to canonicalize anonymous enums

Message ID 87czx7g2wi.fsf@redhat.com
State New
Headers show
Series Use generic internal type name to canonicalize anonymous enums | expand

Commit Message

Dodji Seketeli Feb. 10, 2021, 7:04 p.m. UTC
Hello,

This is from the problem report in Red Hat bugzilla

    https://bugzilla.redhat.com/show_bug.cgi?id=1924624
    "comparing 'libpinyin.so.13.0.0' to itself wrongly yielded result"

During the canonicalization of an anonymous enum, the algorithm uses
its internal pretty representation to limit the number of types to
compare it to.  That internal pretty representation is based on its
type name.

For anonymous types, the type name is not unique; it's constructed for
internal purposes that are different from the purpose of
canonicalization.  So using that in the pretty representation might
negatively impact the accuracy of the canonicalization; it might make
it so that two anonymous in the same namespace types might wrongly be
considered canonically different.

To fix that, this change makes the internal pretty representation of
anonymous enum types essentially be "enum
<namespace-name>::__anonymous_enum__".

This is on part with what is done for unions and classes in commit:
    005ab5c9 Use flat representation to canonicalize anonymous classes and unions

	* src/abg-ir.cc (has_generic_anonymous_internal_type_name) :
	Define new static function.
	(get_generic_anonymous_internal_type_name): Use it here.
	(decl_base::get_pretty_representation): For internal purposes,
	build an anonymous name that is stable.
	* tests/data/test-annotate/test21-pr19092.so.abi: Adjust.
	* tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt: Adjust.
	* tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt: Adjust.
	* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Adjust.
	* tests/data/test-read-dwarf/test-libandroid.so.abi: Adjust.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Adjust.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 src/abg-ir.cc                                 |   40 +-
 .../data/test-annotate/test21-pr19092.so.abi  | 2450 ++++++++---------
 .../PR24690/PR24690-report-0.txt              |    4 +-
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt   |    4 +-
 .../test-read-dwarf/PR22122-libftdc.so.abi    |  148 +-
 .../test-read-dwarf/test-libandroid.so.abi    |    8 +-
 .../test-read-dwarf/test21-pr19092.so.abi     | 2415 ++++++++--------
 7 files changed, 2530 insertions(+), 2539 deletions(-)
diff mbox series

Patch

diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index dec85fe0..bb5345ca 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -257,6 +257,12 @@  namespace ir
 static size_t
 hash_as_canonical_type_or_constant(const type_base *t);
 
+static bool
+has_generic_anonymous_internal_type_name(const decl_base *d);
+
+static interned_string
+get_generic_anonymous_internal_type_name(const decl_base *d);
+
 /// @brief the location of a token represented in its simplest form.
 /// Instances of this type are to be stored in a sorted vector, so the
 /// type must have proper relational operators.
@@ -3913,6 +3919,25 @@  string
 decl_base::get_pretty_representation(bool internal,
 				     bool qualified_name) const
 {
+  if (internal
+      && get_is_anonymous()
+      && has_generic_anonymous_internal_type_name(this))
+    {
+      // We are looking at an anonymous enum, union or class and we
+      // want an *internal* pretty representation for it.  All
+      // anonymous types of this kind in the same namespace must have
+      // the same internal representation for type canonicalization to
+      // work properly.
+      //
+      // OK, in practise, we are certainly looking at an enum because
+      // classes and unions should have their own overloaded virtual
+      // member function for this.
+      string name = get_generic_anonymous_internal_type_name(this);
+      if (qualified_name && !get_qualified_parent_name().empty())
+	name = get_qualified_parent_name() + "::" + name;
+      return name;
+    }
+
   if (qualified_name)
     return get_qualified_name(internal);
   return get_name();
@@ -7135,6 +7160,19 @@  interned_string
 get_type_name(const type_base_sptr& t, bool qualified, bool internal)
 {return get_type_name(t.get(), qualified, internal);}
 
+/// Return true iff a decl is for a type type that has a generic
+/// anonymous internal type name.
+///
+/// @param d the decl to considier.
+///
+/// @return true iff @p d is for a type type that has a generic
+/// anonymous internal type name.
+static bool
+has_generic_anonymous_internal_type_name(const decl_base *d)
+{
+  return is_class_or_union_type(d) || is_enum_type(d);
+}
+
 /// Return the generic internal name of an anonymous type.
 ///
 /// For internal purposes, we want to define a generic name for all
@@ -7148,7 +7186,7 @@  get_type_name(const type_base_sptr& t, bool qualified, bool internal)
 static interned_string
 get_generic_anonymous_internal_type_name(const decl_base *d)
 {
-  ABG_ASSERT(d);
+  ABG_ASSERT(has_generic_anonymous_internal_type_name(d));
 
   const environment *env = d->get_environment();
 
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 460bed11..9e24288a 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -2995,33 +2995,15 @@ 
     </class-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <!-- enum __anonymous_enum__ -->
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='12diagnostic_t' filepath='../.././gcc/diagnostic-core.h' line='32' column='1' id='type-id-185'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='DK_UNSPECIFIED' value='0'/>
-      <enumerator name='DK_IGNORED' value='1'/>
-      <enumerator name='DK_FATAL' value='2'/>
-      <enumerator name='DK_ICE' value='3'/>
-      <enumerator name='DK_ERROR' value='4'/>
-      <enumerator name='DK_SORRY' value='5'/>
-      <enumerator name='DK_WARNING' value='6'/>
-      <enumerator name='DK_ANACHRONISM' value='7'/>
-      <enumerator name='DK_NOTE' value='8'/>
-      <enumerator name='DK_DEBUG' value='9'/>
-      <enumerator name='DK_PEDWARN' value='10'/>
-      <enumerator name='DK_PERMERROR' value='11'/>
-      <enumerator name='DK_LAST_DIAGNOSTIC_KIND' value='12'/>
-      <enumerator name='DK_POP' value='13'/>
-    </enum-decl>
     <!-- struct line_maps -->
-    <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-186'>
+    <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-185'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- maps_info line_maps::info_ordinary -->
-        <var-decl name='info_ordinary' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
+        <var-decl name='info_ordinary' type-id='type-id-186' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- maps_info line_maps::info_macro -->
-        <var-decl name='info_macro' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
+        <var-decl name='info_macro' type-id='type-id-186' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int line_maps::depth -->
@@ -3045,18 +3027,18 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- line_map_realloc line_maps::reallocator -->
-        <var-decl name='reallocator' type-id='type-id-188' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
+        <var-decl name='reallocator' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- line_map_round_alloc_size_func line_maps::round_alloc_size -->
-        <var-decl name='round_alloc_size' type-id='type-id-189' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
+        <var-decl name='round_alloc_size' type-id='type-id-188' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct maps_info -->
-    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-187'>
+    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-186'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- line_map* maps_info::maps -->
-        <var-decl name='maps' type-id='type-id-190' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
+        <var-decl name='maps' type-id='type-id-189' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int maps_info::allocated -->
@@ -3072,20 +3054,20 @@ 
       </data-member>
     </class-decl>
     <!-- typedef void* (void*, typedef size_t)* line_map_realloc -->
-    <typedef-decl name='line_map_realloc' type-id='type-id-191' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-188'/>
+    <typedef-decl name='line_map_realloc' type-id='type-id-190' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-187'/>
     <!-- typedef typedef size_t (typedef size_t)* line_map_round_alloc_size_func -->
-    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-192' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-189'/>
+    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-191' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-188'/>
     <!-- enum location_resolution_kind -->
-    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-193'>
+    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-192'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='LRK_MACRO_EXPANSION_POINT' value='0'/>
       <enumerator name='LRK_SPELLING_LOCATION' value='1'/>
       <enumerator name='LRK_MACRO_DEFINITION_LOCATION' value='2'/>
     </enum-decl>
     <!-- typedef __anonymous_struct__1 expanded_location -->
-    <typedef-decl name='expanded_location' type-id='type-id-194' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-195'/>
+    <typedef-decl name='expanded_location' type-id='type-id-193' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-194'/>
     <!-- struct {const char* file; int line; int column; bool sysp;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-195' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-194'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-194' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-193'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file -->
         <var-decl name='file' type-id='type-id-15' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
@@ -3104,15 +3086,15 @@ 
       </data-member>
     </class-decl>
     <!-- const line_map** -->
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-196'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-195'/>
     <!-- line_map* -->
-    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-190'/>
+    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-189'/>
     <!-- line_maps* -->
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-197'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-196'/>
     <!-- typedef size_t (typedef size_t)* -->
-    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-192'/>
+    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-191'/>
     <!-- void* (void*, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-191'/>
+    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-190'/>
     <!-- void default_diagnostic_finalizer(diagnostic_context*, diagnostic_info*) -->
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
       <!-- parameter of type 'diagnostic_context*' -->
@@ -3458,14 +3440,14 @@ 
       <return type-id='type-id-51'/>
     </function-decl>
     <!-- size_t (size_t) -->
-    <function-type size-in-bits='64' id='type-id-198'>
+    <function-type size-in-bits='64' id='type-id-197'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- typedef size_t -->
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void* (void*, size_t) -->
-    <function-type size-in-bits='64' id='type-id-199'>
+    <function-type size-in-bits='64' id='type-id-198'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -3476,7 +3458,7 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/ggc-none.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- enum gt_types_enum -->
-    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-200'>
+    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-199'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='gt_ggc_e_24lazy_hex_fp_value_struct' value='0'/>
       <enumerator name='gt_ggc_e_15c_inline_static' value='1'/>
@@ -4155,7 +4137,7 @@ 
       <enumerator name='gt_types_enum_last' value='674'/>
     </enum-decl>
     <!-- struct alloc_zone -->
-    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-201'>
+    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-200'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int alloc_zone::dummy -->
         <var-decl name='dummy' type-id='type-id-18' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
@@ -4164,7 +4146,7 @@ 
     <!-- void* ggc_alloc_typed_stat(gt_types_enum, size_t) -->
     <function-decl name='ggc_alloc_typed_stat' mangled-name='_Z20ggc_alloc_typed_stat13gt_types_enumm' filepath='../.././gcc/ggc-none.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20ggc_alloc_typed_stat13gt_types_enumm'>
       <!-- parameter of type 'enum gt_types_enum' -->
-      <parameter type-id='type-id-200' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
+      <parameter type-id='type-id-199' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='size' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <!-- void* -->
@@ -4208,15 +4190,15 @@ 
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- alloc_zone rtl_zone -->
-    <var-decl name='rtl_zone' type-id='type-id-201' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
+    <var-decl name='rtl_zone' type-id='type-id-200' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
     <!-- alloc_zone tree_zone -->
-    <var-decl name='tree_zone' type-id='type-id-201' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
+    <var-decl name='tree_zone' type-id='type-id-200' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
     <!-- alloc_zone tree_id_zone -->
-    <var-decl name='tree_id_zone' type-id='type-id-201' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
+    <var-decl name='tree_id_zone' type-id='type-id-200' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/input.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- struct linemap_stats -->
-    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-202'>
+    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-201'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int linemap_stats::num_ordinary_maps_allocated -->
         <var-decl name='num_ordinary_maps_allocated' type-id='type-id-21' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='687' column='1'/>
@@ -4263,13 +4245,13 @@ 
       </data-member>
     </class-decl>
     <!-- linemap_stats* -->
-    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-203'/>
+    <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-202'/>
     <!-- expanded_location expand_location(source_location) -->
     <function-decl name='expand_location' mangled-name='_Z15expand_locationj' filepath='../.././gcc/input.c' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15expand_locationj'>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- typedef expanded_location -->
-      <return type-id='type-id-195'/>
+      <return type-id='type-id-194'/>
     </function-decl>
     <!-- void dump_line_table_statistics() -->
     <function-decl name='dump_line_table_statistics' mangled-name='_Z26dump_line_table_statisticsv' filepath='../.././gcc/input.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26dump_line_table_statisticsv'>
@@ -4277,21 +4259,21 @@ 
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- line_maps* line_table -->
-    <var-decl name='line_table' type-id='type-id-197' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
+    <var-decl name='line_table' type-id='type-id-196' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
     <!-- location_t input_location -->
     <var-decl name='input_location' type-id='type-id-75' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/intl.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- wchar_t -->
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-204'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-203'/>
     <!-- typedef int nl_item -->
-    <typedef-decl name='nl_item' type-id='type-id-18' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-205'/>
+    <typedef-decl name='nl_item' type-id='type-id-18' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-204'/>
     <!-- const wchar_t -->
-    <qualified-type-def type-id='type-id-204' const='yes' id='type-id-206'/>
+    <qualified-type-def type-id='type-id-203' const='yes' id='type-id-205'/>
     <!-- const wchar_t* -->
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
+    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-206'/>
     <!-- wchar_t* -->
-    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-208'/>
+    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-207'/>
     <!-- void gcc_init_libintl() -->
     <function-decl name='gcc_init_libintl' mangled-name='_Z16gcc_init_libintlv' filepath='../.././gcc/intl.c' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16gcc_init_libintlv'>
       <!-- void -->
@@ -4347,7 +4329,7 @@ 
     <!-- char* nl_langinfo(nl_item) -->
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef nl_item' -->
-      <parameter type-id='type-id-205'/>
+      <parameter type-id='type-id-204'/>
       <!-- char* -->
       <return type-id='type-id-51'/>
     </function-decl>
@@ -4363,7 +4345,7 @@ 
     <!-- size_t mbstowcs(wchar_t*, const char*, size_t) -->
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'wchar_t*' -->
-      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-207'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4374,7 +4356,7 @@ 
     <!-- int wcswidth(const wchar_t*, size_t) -->
     <function-decl name='wcswidth' filepath='/usr/include/wchar.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-207'/>
+      <parameter type-id='type-id-206'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- int -->
@@ -4394,15 +4376,15 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/pretty-print.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- typedef void* iconv_t -->
-    <typedef-decl name='iconv_t' type-id='type-id-14' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-209'/>
+    <typedef-decl name='iconv_t' type-id='type-id-14' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-208'/>
     <!-- const pretty_printer -->
-    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-210'/>
+    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-209'/>
     <!-- const pretty_printer* -->
-    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-211'/>
+    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-210'/>
     <!-- size_t* -->
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-211'/>
     <!-- void* (typedef size_t)* -->
-    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
+    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-213'/>
     <!-- void pp_base_set_line_maximum_length(pretty_printer*, int) -->
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
       <!-- parameter of type 'pretty_printer*' -->
@@ -4470,7 +4452,7 @@ 
     <!-- const char* pp_base_last_position_in_text(const pretty_printer*) -->
     <function-decl name='pp_base_last_position_in_text' mangled-name='_Z29pp_base_last_position_in_textPK17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29pp_base_last_position_in_textPK17pretty_print_info'>
       <!-- parameter of type 'const pretty_printer*' -->
-      <parameter type-id='type-id-211' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
+      <parameter type-id='type-id-210' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-15'/>
     </function-decl>
@@ -4591,7 +4573,7 @@ 
       <return type-id='type-id-15'/>
     </function-decl>
     <!-- void* (typedef size_t)* identifier_to_locale_alloc -->
-    <var-decl name='identifier_to_locale_alloc' type-id='type-id-214' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
+    <var-decl name='identifier_to_locale_alloc' type-id='type-id-213' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
     <!-- void (void*)* identifier_to_locale_free -->
     <var-decl name='identifier_to_locale_free' type-id='type-id-141' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <!-- char* xstrerror(int) -->
@@ -4625,22 +4607,22 @@ 
     <!-- size_t iconv(iconv_t, char**, size_t*, char**, size_t*) -->
     <function-decl name='iconv' filepath='/usr/include/iconv.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-209'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-123'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-212'/>
+      <parameter type-id='type-id-211'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-123'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-212'/>
+      <parameter type-id='type-id-211'/>
       <!-- typedef size_t -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- int iconv_close(iconv_t) -->
     <function-decl name='iconv_close' filepath='/usr/include/iconv.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-209'/>
+      <parameter type-id='type-id-208'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
@@ -4651,10 +4633,10 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- typedef iconv_t -->
-      <return type-id='type-id-209'/>
+      <return type-id='type-id-208'/>
     </function-decl>
     <!-- void* (size_t) -->
-    <function-type size-in-bits='64' id='type-id-213'>
+    <function-type size-in-bits='64' id='type-id-212'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- void* -->
@@ -4663,27 +4645,27 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/tlink.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- struct symbol_stack_entry -->
-    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-215'>
+    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-214'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- symbol* symbol_stack_entry::value -->
-        <var-decl name='value' type-id='type-id-216' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
+        <var-decl name='value' type-id='type-id-215' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- symbol_stack_entry* symbol_stack_entry::next -->
-        <var-decl name='next' type-id='type-id-217' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
+        <var-decl name='next' type-id='type-id-216' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef symbol_hash_entry symbol -->
-    <typedef-decl name='symbol' type-id='type-id-218' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-219'/>
+    <typedef-decl name='symbol' type-id='type-id-217' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-218'/>
     <!-- struct symbol_hash_entry -->
-    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-218'>
+    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* symbol_hash_entry::key -->
         <var-decl name='key' type-id='type-id-15' visibility='default' filepath='../.././gcc/tlink.c' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- file_hash_entry* symbol_hash_entry::file -->
-        <var-decl name='file' type-id='type-id-220' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
+        <var-decl name='file' type-id='type-id-219' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int symbol_hash_entry::chosen -->
@@ -4699,7 +4681,7 @@ 
       </data-member>
     </class-decl>
     <!-- struct file_hash_entry -->
-    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-221'>
+    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-220'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file_hash_entry::key -->
         <var-decl name='key' type-id='type-id-15' visibility='default' filepath='../.././gcc/tlink.c' line='64' column='1'/>
@@ -4722,55 +4704,55 @@ 
       </data-member>
     </class-decl>
     <!-- struct file_stack_entry -->
-    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-222'>
+    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- file* file_stack_entry::value -->
-        <var-decl name='value' type-id='type-id-223' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
+        <var-decl name='value' type-id='type-id-222' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- file_stack_entry* file_stack_entry::next -->
-        <var-decl name='next' type-id='type-id-224' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
+        <var-decl name='next' type-id='type-id-223' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef file_hash_entry file -->
-    <typedef-decl name='file' type-id='type-id-221' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-225'/>
+    <typedef-decl name='file' type-id='type-id-220' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-224'/>
     <!-- typedef unsigned int hashval_t -->
-    <typedef-decl name='hashval_t' type-id='type-id-13' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-226'/>
+    <typedef-decl name='hashval_t' type-id='type-id-13' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-225'/>
     <!-- typedef htab* htab_t -->
-    <typedef-decl name='htab_t' type-id='type-id-227' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-228'/>
+    <typedef-decl name='htab_t' type-id='type-id-226' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-227'/>
     <!-- typedef typedef hashval_t (void*)* htab_hash -->
-    <typedef-decl name='htab_hash' type-id='type-id-229' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-230'/>
+    <typedef-decl name='htab_hash' type-id='type-id-228' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-229'/>
     <!-- typedef int (void*, void*)* htab_eq -->
-    <typedef-decl name='htab_eq' type-id='type-id-231' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-232'/>
+    <typedef-decl name='htab_eq' type-id='type-id-230' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-231'/>
     <!-- typedef void (void*)* htab_del -->
-    <typedef-decl name='htab_del' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-233'/>
+    <typedef-decl name='htab_del' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-232'/>
     <!-- typedef void* (typedef size_t, typedef size_t)* htab_alloc -->
-    <typedef-decl name='htab_alloc' type-id='type-id-234' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-235'/>
+    <typedef-decl name='htab_alloc' type-id='type-id-233' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-234'/>
     <!-- typedef void (void*)* htab_free -->
-    <typedef-decl name='htab_free' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-236'/>
+    <typedef-decl name='htab_free' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-235'/>
     <!-- typedef void* (void*, typedef size_t, typedef size_t)* htab_alloc_with_arg -->
-    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-237' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-238'/>
+    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-236' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-237'/>
     <!-- typedef void (void*, void*)* htab_free_with_arg -->
-    <typedef-decl name='htab_free_with_arg' type-id='type-id-239' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-240'/>
+    <typedef-decl name='htab_free_with_arg' type-id='type-id-238' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-239'/>
     <!-- enum insert_option -->
-    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-241'>
+    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-240'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='NO_INSERT' value='0'/>
       <enumerator name='INSERT' value='1'/>
     </enum-decl>
     <!-- struct htab -->
-    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-242'>
+    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-241'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- htab_hash htab::hash_f -->
-        <var-decl name='hash_f' type-id='type-id-230' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
+        <var-decl name='hash_f' type-id='type-id-229' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- htab_eq htab::eq_f -->
-        <var-decl name='eq_f' type-id='type-id-232' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
+        <var-decl name='eq_f' type-id='type-id-231' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- htab_del htab::del_f -->
-        <var-decl name='del_f' type-id='type-id-233' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
+        <var-decl name='del_f' type-id='type-id-232' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void** htab::entries -->
@@ -4798,11 +4780,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- htab_alloc htab::alloc_f -->
-        <var-decl name='alloc_f' type-id='type-id-235' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
+        <var-decl name='alloc_f' type-id='type-id-234' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- htab_free htab::free_f -->
-        <var-decl name='free_f' type-id='type-id-236' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
+        <var-decl name='free_f' type-id='type-id-235' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- void* htab::alloc_arg -->
@@ -4810,11 +4792,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- htab_alloc_with_arg htab::alloc_with_arg_f -->
-        <var-decl name='alloc_with_arg_f' type-id='type-id-238' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
+        <var-decl name='alloc_with_arg_f' type-id='type-id-237' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- htab_free_with_arg htab::free_with_arg_f -->
-        <var-decl name='free_with_arg_f' type-id='type-id-240' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
+        <var-decl name='free_with_arg_f' type-id='type-id-239' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- unsigned int htab::size_prime_index -->
@@ -4822,27 +4804,27 @@ 
       </data-member>
     </class-decl>
     <!-- file* -->
-    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-222'/>
     <!-- file_hash_entry* -->
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-220'/>
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-219'/>
     <!-- file_stack_entry* -->
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-224'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-223'/>
     <!-- htab* -->
-    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-227'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-226'/>
     <!-- int (void*, void*)* -->
-    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-231'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-230'/>
     <!-- symbol* -->
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-216'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-215'/>
     <!-- symbol_stack_entry* -->
-    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-217'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-216'/>
     <!-- typedef hashval_t (void*)* -->
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-229'/>
+    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-228'/>
     <!-- void (void*, void*)* -->
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-238'/>
     <!-- void* (typedef size_t, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-233'/>
     <!-- void* (void*, typedef size_t, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-236'/>
     <!-- void do_tlink(char**, char**) -->
     <function-decl name='do_tlink' mangled-name='_Z8do_tlinkPPcS0_' filepath='../.././gcc/tlink.c' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8do_tlinkPPcS0_'>
       <!-- parameter of type 'char**' -->
@@ -4855,28 +4837,28 @@ 
     <!-- obstack symbol_stack_obstack -->
     <var-decl name='symbol_stack_obstack' type-id='type-id-58' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
     <!-- symbol_stack_entry* symbol_stack -->
-    <var-decl name='symbol_stack' type-id='type-id-217' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
+    <var-decl name='symbol_stack' type-id='type-id-216' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
     <!-- obstack file_stack_obstack -->
     <var-decl name='file_stack_obstack' type-id='type-id-58' mangled-name='file_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='201' column='1' elf-symbol-id='file_stack_obstack'/>
     <!-- file_stack_entry* file_stack -->
-    <var-decl name='file_stack' type-id='type-id-224' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
+    <var-decl name='file_stack' type-id='type-id-223' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
     <!-- hashval_t htab_hash_string(void*) -->
     <function-decl name='htab_hash_string' filepath='../.././gcc/../include/hashtab.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-226'/>
+      <return type-id='type-id-225'/>
     </function-decl>
     <!-- void** htab_find_slot_with_hash(htab_t, void*, hashval_t, insert_option) -->
     <function-decl name='htab_find_slot_with_hash' filepath='../.././gcc/../include/hashtab.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-227'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-226'/>
+      <parameter type-id='type-id-225'/>
       <!-- parameter of type 'enum insert_option' -->
-      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-240'/>
       <!-- void** -->
       <return type-id='type-id-100'/>
     </function-decl>
@@ -4925,13 +4907,13 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-230'/>
+      <parameter type-id='type-id-229'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-232'/>
+      <parameter type-id='type-id-231'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-233'/>
+      <parameter type-id='type-id-232'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-227'/>
     </function-decl>
     <!-- char* getpwd() -->
     <function-decl name='getpwd' filepath='../.././gcc/../include/libiberty.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4948,7 +4930,7 @@ 
       <return type-id='type-id-51'/>
     </function-decl>
     <!-- int (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-243'>
+    <function-type size-in-bits='64' id='type-id-242'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- parameter of type 'void*' -->
@@ -4957,14 +4939,14 @@ 
       <return type-id='type-id-18'/>
     </function-type>
     <!-- hashval_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-244'>
+    <function-type size-in-bits='64' id='type-id-243'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-226'/>
+      <return type-id='type-id-225'/>
     </function-type>
     <!-- void (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-245'>
+    <function-type size-in-bits='64' id='type-id-244'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- parameter of type 'void*' -->
@@ -4973,7 +4955,7 @@ 
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void* (size_t, size_t) -->
-    <function-type size-in-bits='64' id='type-id-246'>
+    <function-type size-in-bits='64' id='type-id-245'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4982,7 +4964,7 @@ 
       <return type-id='type-id-14'/>
     </function-type>
     <!-- void* (void*, size_t, size_t) -->
-    <function-type size-in-bits='64' id='type-id-247'>
+    <function-type size-in-bits='64' id='type-id-246'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -5159,93 +5141,93 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- char[31] -->
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='248' id='type-id-248'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='248' id='type-id-247'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-4' id='type-id-249'/>
+      <subrange length='31' type-id='type-id-4' id='type-id-248'/>
     </array-type-def>
     <!-- char[6] -->
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='48' id='type-id-250'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='48' id='type-id-249'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-4' id='type-id-251'/>
+      <subrange length='6' type-id='type-id-4' id='type-id-250'/>
     </array-type-def>
     <!-- char[7] -->
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-252'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-251'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-4' id='type-id-253'/>
+      <subrange length='7' type-id='type-id-4' id='type-id-252'/>
     </array-type-def>
     <!-- const char[31] -->
-    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='248' id='type-id-254'>
+    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='248' id='type-id-253'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-4' id='type-id-249'/>
+      <subrange length='31' type-id='type-id-4' id='type-id-248'/>
     </array-type-def>
     <!-- const char[6] -->
-    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='48' id='type-id-255'>
+    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='48' id='type-id-254'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-4' id='type-id-251'/>
+      <subrange length='6' type-id='type-id-4' id='type-id-250'/>
     </array-type-def>
     <!-- const char[7] -->
-    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='56' id='type-id-256'>
+    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='56' id='type-id-255'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-4' id='type-id-253'/>
+      <subrange length='7' type-id='type-id-4' id='type-id-252'/>
     </array-type-def>
     <!-- const char version_string[6] -->
-    <var-decl name='version_string' type-id='type-id-255' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
+    <var-decl name='version_string' type-id='type-id-254' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
     <!-- const char pkgversion_string[7] -->
-    <var-decl name='pkgversion_string' type-id='type-id-256' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
+    <var-decl name='pkgversion_string' type-id='type-id-255' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
     <!-- const char bug_report_url[31] -->
-    <var-decl name='bug_report_url' type-id='type-id-254' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
+    <var-decl name='bug_report_url' type-id='type-id-253' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/charset.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- const uchar** -->
-    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
     <!-- void cpp_init_iconv(cpp_reader*) -->
     <function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void _cpp_destroy_iconv(cpp_reader*) -->
     <function-decl name='_cpp_destroy_iconv' mangled-name='_cpp_destroy_iconv' filepath='../.././libcpp/charset.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_iconv'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- cppchar_t cpp_host_to_exec_charset(cpp_reader*, cppchar_t) -->
     <function-decl name='cpp_host_to_exec_charset' mangled-name='_Z24cpp_host_to_exec_charsetP10cpp_readerj' filepath='../.././libcpp/charset.c' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_host_to_exec_charsetP10cpp_readerj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
       <!-- parameter of type 'typedef cppchar_t' -->
-      <parameter type-id='type-id-260' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-259' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-260'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <!-- cppchar_t _cpp_valid_ucn(cpp_reader*, const uchar**, const uchar*, int, normalize_state*) -->
     <function-decl name='_cpp_valid_ucn' mangled-name='_cpp_valid_ucn' filepath='../.././libcpp/charset.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_valid_ucn'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
       <!-- parameter of type 'const uchar**' -->
-      <parameter type-id='type-id-258' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-257' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-257' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
+      <parameter type-id='type-id-256' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='identifier_pos' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <!-- parameter of type 'normalize_state*' -->
-      <parameter type-id='type-id-261' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
+      <parameter type-id='type-id-260' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-260'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <!-- bool cpp_interpret_string(cpp_reader*, const cpp_string*, size_t, cpp_string*, cpp_ttype) -->
     <function-decl name='cpp_interpret_string' mangled-name='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-262'/>
+      <parameter type-id='type-id-261'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'cpp_string*' -->
-      <parameter type-id='type-id-263'/>
+      <parameter type-id='type-id-262'/>
       <!-- parameter of type 'enum cpp_ttype' -->
       <parameter type-id='type-id-181'/>
       <!-- bool -->
@@ -5254,13 +5236,13 @@ 
     <!-- bool cpp_interpret_string_notranslate(cpp_reader*, const cpp_string*, size_t, cpp_string*, cpp_ttype) -->
     <function-decl name='cpp_interpret_string_notranslate' mangled-name='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-262'/>
+      <parameter type-id='type-id-261'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'cpp_string*' -->
-      <parameter type-id='type-id-263'/>
+      <parameter type-id='type-id-262'/>
       <!-- parameter of type 'enum cpp_ttype' -->
       <parameter type-id='type-id-181'/>
       <!-- bool -->
@@ -5269,22 +5251,22 @@ 
     <!-- cppchar_t cpp_interpret_charconst(cpp_reader*, const cpp_token*, unsigned int*, int*) -->
     <function-decl name='cpp_interpret_charconst' mangled-name='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi' filepath='../.././libcpp/charset.c' line='1602' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264'/>
+      <parameter type-id='type-id-263'/>
       <!-- parameter of type 'unsigned int*' -->
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-264'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-260'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <!-- cpp_hashnode* _cpp_interpret_identifier(cpp_reader*, const uchar*, size_t) -->
     <function-decl name='_cpp_interpret_identifier' mangled-name='_cpp_interpret_identifier' filepath='../.././libcpp/charset.c' line='1634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_interpret_identifier'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-257' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-256' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='len' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- cpp_hashnode* -->
@@ -5293,21 +5275,21 @@ 
     <!-- uchar* _cpp_convert_input(cpp_reader*, const char*, uchar*, size_t, size_t, const unsigned char**, off_t*) -->
     <function-decl name='_cpp_convert_input' mangled-name='_cpp_convert_input' filepath='../.././libcpp/charset.c' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_convert_input'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='input_charset' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-266' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
+      <parameter type-id='type-id-265' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='size' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='len' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-267' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-266' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
       <!-- parameter of type 'off_t*' -->
-      <parameter type-id='type-id-268' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-267' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-266'/>
+      <return type-id='type-id-265'/>
     </function-decl>
     <!-- const char* _cpp_default_encoding() -->
     <function-decl name='_cpp_default_encoding' mangled-name='_cpp_default_encoding' filepath='../.././libcpp/charset.c' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_default_encoding'>
@@ -5315,38 +5297,38 @@ 
       <return type-id='type-id-15'/>
     </function-decl>
     <!-- const cpp_string* -->
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-261'/>
     <!-- const cpp_token* -->
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-263'/>
     <!-- const uchar* -->
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-257'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-256'/>
     <!-- const unsigned char** -->
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-266'/>
     <!-- cpp_reader* -->
-    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-259'/>
+    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-258'/>
     <!-- cpp_string* -->
-    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-262'/>
     <!-- normalize_state* -->
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-260'/>
     <!-- off_t* -->
-    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-268'/>
+    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-267'/>
     <!-- typedef unsigned int cppchar_t -->
-    <typedef-decl name='cppchar_t' type-id='type-id-13' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-260'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-13' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-259'/>
     <!-- uchar* -->
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-265'/>
     <!-- unsigned int* -->
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-264'/>
     <!-- const cpp_string -->
-    <qualified-type-def type-id='type-id-273' const='yes' id='type-id-269'/>
+    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-268'/>
     <!-- const cpp_token -->
-    <qualified-type-def type-id='type-id-277' const='yes' id='type-id-270'/>
+    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-269'/>
     <!-- const uchar -->
-    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-270'/>
     <!-- struct normalize_state -->
-    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-274'>
+    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cppchar_t normalize_state::previous -->
-        <var-decl name='previous' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- unsigned char normalize_state::prev_class -->
@@ -5354,19 +5336,19 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_normalize_level normalize_state::level -->
-        <var-decl name='level' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_reader cpp_reader -->
-    <typedef-decl name='cpp_reader' type-id='type-id-279' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-272'/>
+    <typedef-decl name='cpp_reader' type-id='type-id-278' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-271'/>
     <!-- typedef cpp_string cpp_string -->
-    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-273'/>
+    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
     <!-- typedef __off_t off_t -->
-    <typedef-decl name='off_t' type-id='type-id-54' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-275'/>
+    <typedef-decl name='off_t' type-id='type-id-54' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-274'/>
     <!-- typedef unsigned char uchar -->
-    <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-276'/>
+    <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-275'/>
     <!-- enum cpp_normalize_level -->
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-278'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-277'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
@@ -5374,21 +5356,21 @@ 
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
     <!-- struct cpp_reader -->
-    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-279'>
+    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-278'>
       <member-type access='public'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-280'>
+        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-279'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned char* base -->
-            <var-decl name='base' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- unsigned char* limit -->
-            <var-decl name='limit' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- unsigned char* cur -->
-            <var-decl name='cur' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- source_location first_line -->
@@ -5398,19 +5380,19 @@ 
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_buffer* cpp_reader::buffer -->
-        <var-decl name='buffer' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_buffer* cpp_reader::overlaid_buffer -->
-        <var-decl name='overlaid_buffer' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- lexer_state cpp_reader::state -->
-        <var-decl name='state' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- line_maps* cpp_reader::line_table -->
-        <var-decl name='line_table' type-id='type-id-197' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-196' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- source_location cpp_reader::directive_line -->
@@ -5418,31 +5400,31 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- _cpp_buff* cpp_reader::a_buff -->
-        <var-decl name='a_buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- _cpp_buff* cpp_reader::u_buff -->
-        <var-decl name='u_buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_buff* cpp_reader::free_buffs -->
-        <var-decl name='free_buffs' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- cpp_context cpp_reader::base_context -->
-        <var-decl name='base_context' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- cpp_context* cpp_reader::context -->
-        <var-decl name='context' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- const directive* cpp_reader::directive -->
-        <var-decl name='directive' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- cpp_token cpp_reader::directive_result -->
-        <var-decl name='directive_result' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- source_location cpp_reader::invocation_location -->
@@ -5454,39 +5436,39 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- cpp_dir* cpp_reader::quote_include -->
-        <var-decl name='quote_include' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- cpp_dir* cpp_reader::bracket_include -->
-        <var-decl name='bracket_include' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- cpp_dir cpp_reader::no_search_path -->
-        <var-decl name='no_search_path' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
         <!-- _cpp_file* cpp_reader::all_files -->
-        <var-decl name='all_files' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
         <!-- _cpp_file* cpp_reader::main_file -->
-        <var-decl name='main_file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- htab* cpp_reader::file_hash -->
-        <var-decl name='file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <!-- htab* cpp_reader::dir_hash -->
-        <var-decl name='dir_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- file_hash_entry_pool* cpp_reader::file_hash_entries -->
-        <var-decl name='file_hash_entries' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <!-- htab* cpp_reader::nonexistent_file_hash -->
-        <var-decl name='nonexistent_file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <!-- obstack cpp_reader::nonexistent_file_ob -->
@@ -5502,11 +5484,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
         <!-- const cpp_hashnode* cpp_reader::mi_cmacro -->
-        <var-decl name='mi_cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
         <!-- const cpp_hashnode* cpp_reader::mi_ind_cmacro -->
-        <var-decl name='mi_ind_cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <!-- bool cpp_reader::mi_valid -->
@@ -5518,11 +5500,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <!-- tokenrun cpp_reader::base_run -->
-        <var-decl name='base_run' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <!-- tokenrun* cpp_reader::cur_run -->
-        <var-decl name='cur_run' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <!-- unsigned int cpp_reader::lookaheads -->
@@ -5534,7 +5516,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <!-- unsigned char* cpp_reader::macro_buffer -->
-        <var-decl name='macro_buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <!-- unsigned int cpp_reader::macro_buffer_len -->
@@ -5542,23 +5524,23 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
         <!-- cset_converter cpp_reader::narrow_cset_desc -->
-        <var-decl name='narrow_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
         <!-- cset_converter cpp_reader::utf8_cset_desc -->
-        <var-decl name='utf8_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
         <!-- cset_converter cpp_reader::char16_cset_desc -->
-        <var-decl name='char16_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
         <!-- cset_converter cpp_reader::char32_cset_desc -->
-        <var-decl name='char32_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
         <!-- cset_converter cpp_reader::wide_cset_desc -->
-        <var-decl name='wide_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <!-- const unsigned char* cpp_reader::date -->
@@ -5570,15 +5552,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
         <!-- cpp_token cpp_reader::avoid_paste -->
-        <var-decl name='avoid_paste' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
         <!-- cpp_token cpp_reader::eof -->
-        <var-decl name='eof' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <!-- deps* cpp_reader::deps -->
-        <var-decl name='deps' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <!-- obstack cpp_reader::hash_ob -->
@@ -5590,31 +5572,31 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
         <!-- pragma_entry* cpp_reader::pragmas -->
-        <var-decl name='pragmas' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
         <!-- cpp_callbacks cpp_reader::cb -->
-        <var-decl name='cb' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
         <!-- ht* cpp_reader::hash_table -->
-        <var-decl name='hash_table' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
         <!-- op* cpp_reader::op_stack -->
-        <var-decl name='op_stack' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
         <!-- op* cpp_reader::op_limit -->
-        <var-decl name='op_limit' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
         <!-- cpp_options cpp_reader::opts -->
-        <var-decl name='opts' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
         <!-- spec_nodes cpp_reader::spec_nodes -->
-        <var-decl name='spec_nodes' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <!-- bool cpp_reader::our_hashtable -->
@@ -5622,7 +5604,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} cpp_reader::out -->
-        <var-decl name='out' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <!-- const unsigned char* cpp_reader::saved_cur -->
@@ -5638,7 +5620,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
         <!-- cpp_savedstate* cpp_reader::savedstate -->
-        <var-decl name='savedstate' type-id='type-id-303' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <!-- unsigned int cpp_reader::counter -->
@@ -5646,11 +5628,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <!-- cpp_comment_table cpp_reader::comments -->
-        <var-decl name='comments' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-303' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <!-- def_pragma_macro* cpp_reader::pushed_macros -->
-        <var-decl name='pushed_macros' type-id='type-id-305' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <!-- source_location* cpp_reader::forced_token_location_p -->
@@ -5658,131 +5640,131 @@ 
       </data-member>
     </class-decl>
     <!-- typedef cpp_token cpp_token -->
-    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-277'/>
+    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-276'/>
     <!-- _cpp_buff* -->
-    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-284'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-283'/>
     <!-- _cpp_file* -->
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-289'/>
     <!-- const cpp_hashnode* -->
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-292'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-291'/>
     <!-- const directive* -->
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-286'/>
     <!-- cpp_buffer* -->
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-281'/>
     <!-- cpp_context* -->
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
     <!-- cpp_dir* -->
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-288'/>
+    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-287'/>
     <!-- cpp_savedstate* -->
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-302'/>
     <!-- def_pragma_macro* -->
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-304'/>
     <!-- deps* -->
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-295'/>
     <!-- file_hash_entry_pool* -->
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-290'/>
     <!-- ht* -->
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-298'/>
     <!-- op* -->
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
     <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-296'/>
     <!-- struct cpp_callbacks -->
-    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-298'>
+    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
-        <var-decl name='line_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
-        <var-decl name='file_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
-        <var-decl name='dir_change' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
-        <var-decl name='include' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
-        <var-decl name='define' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
-        <var-decl name='undef' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
-        <var-decl name='ident' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
-        <var-decl name='def_pragma' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
-        <var-decl name='valid_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
-        <var-decl name='read_pch' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- missing_header_cb cpp_callbacks::missing_header -->
-        <var-decl name='missing_header' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
-        <var-decl name='macro_to_expand' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
-        <var-decl name='error' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
-        <var-decl name='used_define' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
-        <var-decl name='used_undef' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
-        <var-decl name='before_define' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
-        <var-decl name='used' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
-        <var-decl name='user_builtin_macro' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_context -->
-    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-285'>
+    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-284'>
       <member-type access='public'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-332'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-331'>
           <member-type access='private'>
             <!-- struct {utoken first; utoken last;} -->
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-333'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-332'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- utoken first -->
-                <var-decl name='first' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- utoken last -->
-                <var-decl name='last' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-335'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-334'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- const unsigned char* cur -->
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
@@ -5795,20 +5777,20 @@ 
           </member-type>
           <data-member access='private'>
             <!-- struct {utoken first; utoken last;} iso -->
-            <var-decl name='iso' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
-            <var-decl name='trad' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-336'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-335'>
           <data-member access='private'>
             <!-- macro_context* mc -->
-            <var-decl name='mc' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_hashnode* macro -->
@@ -5818,34 +5800,34 @@ 
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_context* cpp_context::next -->
-        <var-decl name='next' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_context* cpp_context::prev -->
-        <var-decl name='prev' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} cpp_context::u -->
-        <var-decl name='u' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_buff* cpp_context::buff -->
-        <var-decl name='buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} cpp_context::c -->
-        <var-decl name='c' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- context_tokens_kind cpp_context::tokens_kind -->
-        <var-decl name='tokens_kind' type-id='type-id-338' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_dir -->
-    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-289'>
+    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-288'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_dir* cpp_dir::next -->
-        <var-decl name='next' type-id='type-id-288' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-287' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* cpp_dir::name -->
@@ -5869,29 +5851,29 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** cpp_dir::name_map -->
-        <var-decl name='name_map' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
-        <var-decl name='construct' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- ino_t cpp_dir::ino -->
-        <var-decl name='ino' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- dev_t cpp_dir::dev -->
-        <var-decl name='dev' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_options -->
-    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-301'>
+    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-300'>
       <member-type access='public'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-343'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-342'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- cpp_deps_style style -->
-            <var-decl name='style' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- bool missing_files -->
@@ -5917,7 +5899,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- c_lang cpp_options::lang -->
-        <var-decl name='lang' type-id='type-id-345' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char cpp_options::cplusplus -->
@@ -6085,7 +6067,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- cpp_normalize_level cpp_options::warn_normalize -->
-        <var-decl name='warn_normalize' type-id='type-id-278' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-277' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- bool cpp_options::warn_invalid_pch -->
@@ -6097,7 +6079,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} cpp_options::deps -->
-        <var-decl name='deps' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- size_t cpp_options::precision -->
@@ -6137,14 +6119,14 @@ 
       </data-member>
     </class-decl>
     <!-- struct cset_converter -->
-    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-295'>
+    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- convert_f cset_converter::func -->
-        <var-decl name='func' type-id='type-id-346' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- iconv_t cset_converter::cd -->
-        <var-decl name='cd' type-id='type-id-209' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-208' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int cset_converter::width -->
@@ -6152,7 +6134,7 @@ 
       </data-member>
     </class-decl>
     <!-- struct lexer_state -->
-    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-283'>
+    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-282'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned char lexer_state::in_directive -->
         <var-decl name='in_directive' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
@@ -6211,7 +6193,7 @@ 
       </data-member>
     </class-decl>
     <!-- struct spec_nodes -->
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-302'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-301'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* spec_nodes::n_defined -->
         <var-decl name='n_defined' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
@@ -6230,29 +6212,29 @@ 
       </data-member>
     </class-decl>
     <!-- tokenrun* -->
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-293'/>
     <!-- typedef __anonymous_struct__1 cpp_comment_table -->
-    <typedef-decl name='cpp_comment_table' type-id='type-id-348' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-304'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-347' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-303'/>
     <!-- typedef tokenrun tokenrun -->
-    <typedef-decl name='tokenrun' type-id='type-id-347' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-293'/>
+    <typedef-decl name='tokenrun' type-id='type-id-346' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-292'/>
     <!-- unsigned char* -->
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-280'/>
     <!-- bool (cpp_reader*, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-331'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-330'/>
     <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-328'/>
     <!-- char* (const char*, cpp_dir*)* -->
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-339'/>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-338'/>
     <!-- const cpp_hashnode -->
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
+    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-307'/>
     <!-- const directive -->
-    <qualified-type-def type-id='type-id-353' const='yes' id='type-id-309'/>
+    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-327'/>
     <!-- enum c_lang -->
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-345'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-344'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -6268,44 +6250,44 @@ 
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
     <!-- enum context_tokens_kind -->
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-338'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-337'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
     <!-- enum cpp_deps_style -->
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-344'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-343'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
     <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-324'/>
     <!-- macro_context* -->
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-336'/>
     <!-- struct _cpp_buff -->
-    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-306'>
+    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-305'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- _cpp_buff* _cpp_buff::next -->
-        <var-decl name='next' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char* _cpp_buff::base -->
-        <var-decl name='base' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* _cpp_buff::cur -->
-        <var-decl name='cur' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned char* _cpp_buff::limit -->
-        <var-decl name='limit' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct _cpp_file -->
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-307'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-306'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* _cpp_file::name -->
         <var-decl name='name' type-id='type-id-15' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
@@ -6324,23 +6306,23 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_file* _cpp_file::next_file -->
-        <var-decl name='next_file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- const uchar* _cpp_file::buffer -->
-        <var-decl name='buffer' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- const uchar* _cpp_file::buffer_start -->
-        <var-decl name='buffer_start' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-256' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- const cpp_hashnode* _cpp_file::cmacro -->
-        <var-decl name='cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_dir* _cpp_file::dir -->
-        <var-decl name='dir' type-id='type-id-288' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-287' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- stat _cpp_file::st -->
@@ -6376,7 +6358,7 @@ 
       </data-member>
     </class-decl>
     <!-- struct cpp_buffer -->
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-310'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-309'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* cpp_buffer::cur -->
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
@@ -6399,7 +6381,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- _cpp_line_note* cpp_buffer::notes -->
-        <var-decl name='notes' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int cpp_buffer::cur_note -->
@@ -6415,11 +6397,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_buffer* cpp_buffer::prev -->
-        <var-decl name='prev' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_file* cpp_buffer::file -->
-        <var-decl name='file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- const unsigned char* cpp_buffer::timestamp -->
@@ -6427,7 +6409,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- if_stack* cpp_buffer::if_stack -->
-        <var-decl name='if_stack' type-id='type-id-358' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool cpp_buffer::need_line -->
@@ -6451,20 +6433,20 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- cpp_dir cpp_buffer::dir -->
-        <var-decl name='dir' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- cset_converter cpp_buffer::input_cset_desc -->
-        <var-decl name='input_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_savedstate -->
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-311'/>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-310'/>
     <!-- struct def_pragma_macro -->
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-312'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-311'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- def_pragma_macro* def_pragma_macro::next -->
-        <var-decl name='next' type-id='type-id-305' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* def_pragma_macro::name -->
@@ -6472,7 +6454,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* def_pragma_macro::definition -->
-        <var-decl name='definition' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- source_location def_pragma_macro::line -->
@@ -6492,10 +6474,10 @@ 
       </data-member>
     </class-decl>
     <!-- struct deps -->
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-313'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char** deps::targetv -->
-        <var-decl name='targetv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int deps::ntargets -->
@@ -6507,7 +6489,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char** deps::depv -->
-        <var-decl name='depv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned int deps::ndeps -->
@@ -6519,11 +6501,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** deps::vpathv -->
-        <var-decl name='vpathv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- size_t* deps::vpathlv -->
-        <var-decl name='vpathlv' type-id='type-id-212' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-211' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int deps::nvpaths -->
@@ -6535,24 +6517,24 @@ 
       </data-member>
     </class-decl>
     <!-- struct file_hash_entry_pool -->
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-314'/>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-313'/>
     <!-- struct ht -->
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-315'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-314'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- obstack ht::stack -->
         <var-decl name='stack' type-id='type-id-58' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- hashnode* ht::entries -->
-        <var-decl name='entries' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
-        <var-decl name='alloc_node' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void* (typedef size_t)* ht::alloc_subobject -->
-        <var-decl name='alloc_subobject' type-id='type-id-214' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-213' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- unsigned int ht::nslots -->
@@ -6564,7 +6546,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- cpp_reader* ht::pfile -->
-        <var-decl name='pfile' type-id='type-id-259' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-258' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- unsigned int ht::searches -->
@@ -6580,14 +6562,14 @@ 
       </data-member>
     </class-decl>
     <!-- struct op -->
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-316'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-315'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const cpp_token* op::token -->
-        <var-decl name='token' type-id='type-id-264' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num op::value -->
-        <var-decl name='value' type-id='type-id-361' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-360' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- source_location op::loc -->
@@ -6599,16 +6581,16 @@ 
       </data-member>
     </class-decl>
     <!-- struct pragma_entry -->
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-317'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-316'/>
     <!-- struct tokenrun -->
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-347'>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-346'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- tokenrun* tokenrun::next -->
-        <var-decl name='next' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- tokenrun* tokenrun::prev -->
-        <var-decl name='prev' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token* tokenrun::base -->
@@ -6620,10 +6602,10 @@ 
       </data-member>
     </class-decl>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-348'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-362' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -6635,75 +6617,75 @@ 
       </data-member>
     </class-decl>
     <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
-    <typedef-decl name='convert_f' type-id='type-id-363' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-346'/>
+    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-345'/>
     <!-- typedef __dev_t dev_t -->
-    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-342'/>
+    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-341'/>
     <!-- typedef __ino_t ino_t -->
-    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-341'/>
+    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-340'/>
     <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
-    <typedef-decl name='missing_header_cb' type-id='type-id-364' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-327'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-326'/>
     <!-- union utoken -->
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-334'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-333'>
       <data-member access='private'>
         <!-- const cpp_token* utoken::token -->
-        <var-decl name='token' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- const cpp_token** utoken::ptoken -->
-        <var-decl name='ptoken' type-id='type-id-365' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-364' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
     <!-- void (cpp_reader*)* -->
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-329'/>
     <!-- void (cpp_reader*, const char*)* -->
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-319'/>
     <!-- void (cpp_reader*, const char*, int, const char*)* -->
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-325'/>
     <!-- void (cpp_reader*, const cpp_token*, int)* -->
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-317'/>
     <!-- void (cpp_reader*, const line_map*)* -->
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
     <!-- void (cpp_reader*, typedef source_location)* -->
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-324'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-323'/>
     <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-322'/>
     <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-320'/>
     <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
     <!-- _cpp_line_note* -->
-    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-357'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-356'/>
     <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-364'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
     <!-- const cpp_token** -->
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-364'/>
     <!-- cpp_comment* -->
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-361'/>
     <!-- hashnode* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-359'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-358'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-357'/>
     <!-- struct directive -->
-    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-353'/>
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-352'/>
     <!-- typedef cpp_hashnode cpp_hashnode -->
-    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-352'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-351'/>
     <!-- typedef cpp_num cpp_num -->
-    <typedef-decl name='cpp_num' type-id='type-id-381' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-361'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-360'/>
     <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-359'/>
     <!-- typedef __anonymous_struct__ macro_context -->
-    <typedef-decl name='macro_context' type-id='type-id-383' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-356'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-355'/>
     <!-- struct cpp_num -->
-    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-381'>
+    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_num_part cpp_num::high -->
-        <var-decl name='high' type-id='type-id-384' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num_part cpp_num::low -->
-        <var-decl name='low' type-id='type-id-384' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- bool cpp_num::unsignedp -->
@@ -6715,9 +6697,9 @@ 
       </data-member>
     </class-decl>
     <!-- struct if_stack -->
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-380'/>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-379'/>
     <!-- struct {cpp_hashnode* macro_node; source_location* virt_locs; source_location* cur_virt_loc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-383'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* macro_node -->
         <var-decl name='macro_node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
@@ -6732,15 +6714,15 @@ 
       </data-member>
     </class-decl>
     <!-- typedef _cpp_line_note _cpp_line_note -->
-    <typedef-decl name='_cpp_line_note' type-id='type-id-385' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-375'/>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-374'/>
     <!-- typedef __anonymous_struct__2 cpp_comment -->
-    <typedef-decl name='cpp_comment' type-id='type-id-386' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-378'/>
+    <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
     <!-- typedef ht_identifier* hashnode -->
-    <typedef-decl name='hashnode' type-id='type-id-387' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-379'/>
+    <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
     <!-- ht_identifier* -->
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
     <!-- struct _cpp_line_note -->
-    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-385'>
+    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* _cpp_line_note::pos -->
         <var-decl name='pos' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
@@ -6751,7 +6733,7 @@ 
       </data-member>
     </class-decl>
     <!-- struct {char* comment; source_location sloc;} -->
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-378' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-386'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-377' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-385'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* comment -->
         <var-decl name='comment' type-id='type-id-51' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
@@ -6762,17 +6744,17 @@ 
       </data-member>
     </class-decl>
     <!-- typedef unsigned long int cpp_num_part -->
-    <typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-384'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-383'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef void (cpp_reader*)* pragma_cb -->
-    <typedef-decl name='pragma_cb' type-id='type-id-330' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-388'/>
+    <typedef-decl name='pragma_cb' type-id='type-id-329' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-387'/>
     <!-- typedef cpp_options cpp_options -->
-    <typedef-decl name='cpp_options' type-id='type-id-301' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-389'/>
+    <typedef-decl name='cpp_options' type-id='type-id-300' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-388'/>
     <!-- typedef cpp_callbacks cpp_callbacks -->
-    <typedef-decl name='cpp_callbacks' type-id='type-id-298' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-390'/>
+    <typedef-decl name='cpp_callbacks' type-id='type-id-297' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-389'/>
     <!-- enum include_type -->
-    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-391'>
+    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-390'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='IT_INCLUDE' value='0'/>
       <enumerator name='IT_INCLUDE_NEXT' value='1'/>
@@ -6780,28 +6762,28 @@ 
       <enumerator name='IT_CMDLINE' value='3'/>
     </enum-decl>
     <!-- typedef int (cpp_reader*, cpp_hashnode*, void*)* cpp_cb -->
-    <typedef-decl name='cpp_cb' type-id='type-id-392' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-393'/>
+    <typedef-decl name='cpp_cb' type-id='type-id-391' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-392'/>
     <!-- cpp_callbacks* -->
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-393'/>
     <!-- cpp_options* -->
-    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-395'/>
+    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-394'/>
     <!-- cpp_string* -->
-    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-262'/>
     <!-- int (cpp_reader*, cpp_hashnode*, void*)* -->
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-392'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-391'/>
     <!-- unsigned int* -->
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-264'/>
     <!-- void cpp_undef_all(cpp_reader*) -->
     <function-decl name='cpp_undef_all' mangled-name='_Z13cpp_undef_allP10cpp_reader' filepath='../.././libcpp/directives.c' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_undef_allP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void _cpp_do_file_change(cpp_reader*, lc_reason, const char*, linenum_type, unsigned int) -->
     <function-decl name='_cpp_do_file_change' mangled-name='_cpp_do_file_change' filepath='../.././libcpp/directives.c' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do_file_change'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-108' name='reason' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -6816,13 +6798,13 @@ 
     <!-- void cpp_register_pragma(cpp_reader*, const char*, const char*, pragma_cb, bool) -->
     <function-decl name='cpp_register_pragma' mangled-name='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb' filepath='../.././libcpp/directives.c' line='1214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='space' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='name' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'typedef pragma_cb' -->
-      <parameter type-id='type-id-388' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
+      <parameter type-id='type-id-387' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-1' name='allow_expansion' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <!-- void -->
@@ -6831,7 +6813,7 @@ 
     <!-- void cpp_register_deferred_pragma(cpp_reader*, const char*, const char*, unsigned int, bool, bool) -->
     <function-decl name='cpp_register_deferred_pragma' mangled-name='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb' filepath='../.././libcpp/directives.c' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='space' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -6848,21 +6830,21 @@ 
     <!-- void _cpp_init_internal_pragmas(cpp_reader*) -->
     <function-decl name='_cpp_init_internal_pragmas' mangled-name='_cpp_init_internal_pragmas' filepath='../.././libcpp/directives.c' line='1254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_internal_pragmas'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- char** _cpp_save_pragma_names(cpp_reader*) -->
     <function-decl name='_cpp_save_pragma_names' mangled-name='_cpp_save_pragma_names' filepath='../.././libcpp/directives.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_pragma_names'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
       <!-- char** -->
       <return type-id='type-id-123'/>
     </function-decl>
     <!-- void _cpp_restore_pragma_names(cpp_reader*, char**) -->
     <function-decl name='_cpp_restore_pragma_names' mangled-name='_cpp_restore_pragma_names' filepath='../.././libcpp/directives.c' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_restore_pragma_names'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-123' name='saved' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <!-- void -->
@@ -6871,59 +6853,59 @@ 
     <!-- int _cpp_test_assertion(cpp_reader*, unsigned int*) -->
     <function-decl name='_cpp_test_assertion' mangled-name='_cpp_test_assertion' filepath='../.././libcpp/directives.c' line='2225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_test_assertion'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
-      <parameter type-id='type-id-265' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-264' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- cpp_options* cpp_get_options(cpp_reader*) -->
     <function-decl name='cpp_get_options' mangled-name='_Z15cpp_get_optionsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_get_optionsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
       <!-- cpp_options* -->
-      <return type-id='type-id-395'/>
+      <return type-id='type-id-394'/>
     </function-decl>
     <!-- cpp_callbacks* cpp_get_callbacks(cpp_reader*) -->
     <function-decl name='cpp_get_callbacks' mangled-name='_Z17cpp_get_callbacksP10cpp_reader' filepath='../.././libcpp/directives.c' line='2499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_get_callbacksP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
       <!-- cpp_callbacks* -->
-      <return type-id='type-id-394'/>
+      <return type-id='type-id-393'/>
     </function-decl>
     <!-- void cpp_set_callbacks(cpp_reader*, cpp_callbacks*) -->
     <function-decl name='cpp_set_callbacks' mangled-name='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks' filepath='../.././libcpp/directives.c' line='2506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <!-- parameter of type 'cpp_callbacks*' -->
-      <parameter type-id='type-id-394' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-393' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- deps* cpp_get_deps(cpp_reader*) -->
     <function-decl name='cpp_get_deps' mangled-name='_Z12cpp_get_depsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2513' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_depsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
       <!-- deps* -->
-      <return type-id='type-id-296'/>
+      <return type-id='type-id-295'/>
     </function-decl>
     <!-- cpp_buffer* cpp_push_buffer(cpp_reader*, const uchar*, size_t, int) -->
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/directives.c' line='2524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_push_bufferP10cpp_readerPKhmi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-257' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-256' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='len' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='from_stage3' filepath='../.././libcpp/directives.c' line='2525' column='1'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-282'/>
+      <return type-id='type-id-281'/>
     </function-decl>
     <!-- void cpp_unassert(cpp_reader*, const char*) -->
     <function-decl name='cpp_unassert' mangled-name='_Z12cpp_unassertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_unassertP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -6932,7 +6914,7 @@ 
     <!-- void cpp_assert(cpp_reader*, const char*) -->
     <function-decl name='cpp_assert' mangled-name='_Z10cpp_assertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_assertP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -6941,7 +6923,7 @@ 
     <!-- void cpp_undef(cpp_reader*, const char*) -->
     <function-decl name='cpp_undef' mangled-name='_Z9cpp_undefP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_undefP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -6950,7 +6932,7 @@ 
     <!-- void _cpp_define_builtin(cpp_reader*, const char*) -->
     <function-decl name='_cpp_define_builtin' mangled-name='_cpp_define_builtin' filepath='../.././libcpp/directives.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_define_builtin'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -6959,7 +6941,7 @@ 
     <!-- void cpp_define(cpp_reader*, const char*) -->
     <function-decl name='cpp_define' mangled-name='_Z10cpp_defineP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_defineP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -6968,7 +6950,7 @@ 
     <!-- void cpp_define_formatted(cpp_reader*, const char*, ...) -->
     <function-decl name='cpp_define_formatted' mangled-name='_Z20cpp_define_formattedP10cpp_readerPKcz' filepath='../.././libcpp/directives.c' line='2364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_define_formattedP10cpp_readerPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='fmt' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <parameter is-variadic='yes'/>
@@ -6978,14 +6960,14 @@ 
     <!-- void _cpp_init_directives(cpp_reader*) -->
     <function-decl name='_cpp_init_directives' mangled-name='_cpp_init_directives' filepath='../.././libcpp/directives.c' line='2580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_directives'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- bool _cpp_parse_expr(cpp_reader*, bool) -->
     <function-decl name='_cpp_parse_expr' mangled-name='_cpp_parse_expr' filepath='../.././libcpp/internal.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_parse_expr'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-1'/>
       <!-- bool -->
@@ -6994,7 +6976,7 @@ 
     <!-- void _cpp_overlay_buffer(cpp_reader*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_overlay_buffer' filepath='../.././libcpp/internal.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -7016,20 +6998,20 @@ 
     <!-- bool _cpp_stack_include(cpp_reader*, const char*, int, include_type) -->
     <function-decl name='_cpp_stack_include' mangled-name='_cpp_stack_include' filepath='../.././libcpp/internal.h' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_include'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'enum include_type' -->
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-390'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int _cpp_compare_file_date(cpp_reader*, const char*, int) -->
     <function-decl name='_cpp_compare_file_date' mangled-name='_cpp_compare_file_date' filepath='../.././libcpp/internal.h' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_compare_file_date'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'int' -->
@@ -7040,7 +7022,7 @@ 
     <!-- cpp_hashnode* _cpp_lex_identifier(cpp_reader*, const char*) -->
     <function-decl name='_cpp_lex_identifier' mangled-name='_cpp_lex_identifier' filepath='../.././libcpp/internal.h' line='655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_identifier'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- cpp_hashnode* -->
@@ -7049,16 +7031,16 @@ 
     <!-- void _cpp_mark_file_once_only(cpp_reader*, _cpp_file*) -->
     <function-decl name='_cpp_mark_file_once_only' mangled-name='_cpp_mark_file_once_only' filepath='../.././libcpp/internal.h' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_mark_file_once_only'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-290'/>
+      <parameter type-id='type-id-289'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void _cpp_fake_include(cpp_reader*, const char*) -->
     <function-decl name='_cpp_fake_include' mangled-name='_cpp_fake_include' filepath='../.././libcpp/internal.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_fake_include'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -7067,9 +7049,9 @@ 
     <!-- void _cpp_pop_file_buffer(cpp_reader*, _cpp_file*) -->
     <function-decl name='_cpp_pop_file_buffer' mangled-name='_cpp_pop_file_buffer' filepath='../.././libcpp/internal.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_file_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-290'/>
+      <parameter type-id='type-id-289'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -7083,9 +7065,9 @@ 
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- int (cpp_reader*, cpp_hashnode*, void*) -->
-    <function-type size-in-bits='64' id='type-id-396'>
+    <function-type size-in-bits='64' id='type-id-395'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile'/>
+      <parameter type-id='type-id-258' name='pfile'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116' name='node'/>
       <!-- parameter of type 'void*' -->
@@ -7098,7 +7080,7 @@ 
     <!-- bool cpp_error(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_error' mangled-name='_Z9cpp_errorP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errorP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char*' -->
@@ -7110,7 +7092,7 @@ 
     <!-- bool cpp_warning(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_warning' mangled-name='_Z11cpp_warningP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_warningP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char*' -->
@@ -7122,7 +7104,7 @@ 
     <!-- bool cpp_pedwarning(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_pedwarning' mangled-name='_Z14cpp_pedwarningP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_pedwarningP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char*' -->
@@ -7134,7 +7116,7 @@ 
     <!-- bool cpp_warning_syshdr(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_warning_syshdr' mangled-name='_Z18cpp_warning_syshdrP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_warning_syshdrP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char*' -->
@@ -7146,7 +7128,7 @@ 
     <!-- bool cpp_error_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_error_with_line' mangled-name='_Z19cpp_error_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/errors.c' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_error_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7162,7 +7144,7 @@ 
     <!-- bool cpp_warning_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_warning_with_line' mangled-name='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/errors.c' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7178,7 +7160,7 @@ 
     <!-- bool cpp_pedwarning_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_pedwarning_with_line' mangled-name='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/errors.c' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7194,7 +7176,7 @@ 
     <!-- bool cpp_warning_with_line_syshdr(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_warning_with_line_syshdr' mangled-name='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz' filepath='../.././libcpp/errors.c' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7210,7 +7192,7 @@ 
     <!-- bool cpp_errno(cpp_reader*, int, const char*) -->
     <function-decl name='cpp_errno' mangled-name='_Z9cpp_errnoP10cpp_readeriPKc' filepath='../.././libcpp/errors.c' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errnoP10cpp_readeriPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char*' -->
@@ -7230,16 +7212,16 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef cpp_num cpp_num -->
-    <typedef-decl name='cpp_num' type-id='type-id-381' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-361'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-360'/>
     <!-- struct cpp_num -->
-    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-381'>
+    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_num_part cpp_num::high -->
-        <var-decl name='high' type-id='type-id-384' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num_part cpp_num::low -->
-        <var-decl name='low' type-id='type-id-384' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- bool cpp_num::unsignedp -->
@@ -7251,9 +7233,9 @@ 
       </data-member>
     </class-decl>
     <!-- typedef unsigned long int cpp_num_part -->
-    <typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-384'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-383'/>
     <!-- typedef unsigned int cppchar_t -->
-    <typedef-decl name='cppchar_t' type-id='type-id-13' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-260'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-13' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-259'/>
     <!-- unsigned int cpp_interpret_float_suffix(const char*, size_t) -->
     <function-decl name='cpp_interpret_float_suffix' mangled-name='_Z26cpp_interpret_float_suffixPKcm' filepath='../.././libcpp/expr.c' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26cpp_interpret_float_suffixPKcm'>
       <!-- parameter of type 'const char*' -->
@@ -7317,65 +7299,65 @@ 
     <!-- const char* cpp_get_userdef_suffix(const cpp_token*) -->
     <function-decl name='cpp_get_userdef_suffix' mangled-name='_Z22cpp_get_userdef_suffixPK9cpp_token' filepath='../.././libcpp/expr.c' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_get_userdef_suffixPK9cpp_token'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
+      <parameter type-id='type-id-263' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-15'/>
     </function-decl>
     <!-- unsigned int cpp_classify_number(cpp_reader*, const cpp_token*, const char**) -->
     <function-decl name='cpp_classify_number' mangled-name='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc' filepath='../.././libcpp/expr.c' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-263' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-339' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
+      <parameter type-id='type-id-338' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-13'/>
     </function-decl>
     <!-- cpp_num cpp_interpret_integer(cpp_reader*, const cpp_token*, unsigned int) -->
     <function-decl name='cpp_interpret_integer' mangled-name='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj' filepath='../.././libcpp/expr.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-263' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='type' filepath='../.././libcpp/expr.c' line='636' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-361'/>
+      <return type-id='type-id-360'/>
     </function-decl>
     <!-- op* _cpp_expand_op_stack(cpp_reader*) -->
     <function-decl name='_cpp_expand_op_stack' mangled-name='_cpp_expand_op_stack' filepath='../.././libcpp/expr.c' line='1396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expand_op_stack'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
       <!-- op* -->
-      <return type-id='type-id-300'/>
+      <return type-id='type-id-299'/>
     </function-decl>
     <!-- cpp_num cpp_num_sign_extend(cpp_num, size_t) -->
     <function-decl name='cpp_num_sign_extend' mangled-name='_Z19cpp_num_sign_extend7cpp_numm' filepath='../.././libcpp/expr.c' line='1464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_num_sign_extend7cpp_numm'>
       <!-- parameter of type 'typedef cpp_num' -->
-      <parameter type-id='type-id-361' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
+      <parameter type-id='type-id-360' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='precision' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-361'/>
+      <return type-id='type-id-360'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-397'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-396'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-4' id='type-id-398'/>
+      <subrange length='256' type-id='type-id-4' id='type-id-397'/>
     </array-type-def>
     <!-- typedef __ssize_t ssize_t -->
-    <typedef-decl name='ssize_t' type-id='type-id-399' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-400'/>
+    <typedef-decl name='ssize_t' type-id='type-id-398' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-399'/>
     <!-- typedef long int __ssize_t -->
-    <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-399'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-398'/>
     <!-- typedef __off_t off_t -->
-    <typedef-decl name='off_t' type-id='type-id-54' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-275'/>
+    <typedef-decl name='off_t' type-id='type-id-54' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-274'/>
     <!-- typedef __dirstream DIR -->
-    <typedef-decl name='DIR' type-id='type-id-401' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-402'/>
+    <typedef-decl name='DIR' type-id='type-id-400' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-401'/>
     <!-- struct dirent -->
-    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-403'>
+    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-402'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- __ino_t dirent::d_ino -->
         <var-decl name='d_ino' type-id='type-id-64' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
@@ -7394,51 +7376,51 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
         <!-- char dirent::d_name[256] -->
-        <var-decl name='d_name' type-id='type-id-397' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
+        <var-decl name='d_name' type-id='type-id-396' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef int (void*, void*)* __compar_fn_t -->
-    <typedef-decl name='__compar_fn_t' type-id='type-id-231' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-404'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-230' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-403'/>
     <!-- typedef int (void**, void*)* htab_trav -->
-    <typedef-decl name='htab_trav' type-id='type-id-405' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-406'/>
+    <typedef-decl name='htab_trav' type-id='type-id-404' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-405'/>
     <!-- DIR* -->
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-407'/>
+    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-406'/>
     <!-- const unsigned char** -->
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-266'/>
     <!-- dirent* -->
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-408'/>
+    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-407'/>
     <!-- int (void**, void*)* -->
-    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-404'/>
     <!-- off_t* -->
-    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-268'/>
+    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-267'/>
     <!-- bool _cpp_find_failed(_cpp_file*) -->
     <function-decl name='_cpp_find_failed' mangled-name='_cpp_find_failed' filepath='../.././libcpp/files.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_failed'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-290' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
+      <parameter type-id='type-id-289' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- _cpp_file* _cpp_find_file(cpp_reader*, const char*, cpp_dir*, bool, int) -->
     <function-decl name='_cpp_find_file' mangled-name='_cpp_find_file' filepath='../.././libcpp/files.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_file'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='fname' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-288' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-287' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-1' name='fake' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='angle_brackets' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- _cpp_file* -->
-      <return type-id='type-id-290'/>
+      <return type-id='type-id-289'/>
     </function-decl>
     <!-- bool _cpp_stack_file(cpp_reader*, _cpp_file*, bool) -->
     <function-decl name='_cpp_stack_file' mangled-name='_cpp_stack_file' filepath='../.././libcpp/files.c' line='796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_file'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-290' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-289' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-1' name='import' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- bool -->
@@ -7447,7 +7429,7 @@ 
     <!-- bool cpp_included(cpp_reader*, const char*) -->
     <function-decl name='cpp_included' mangled-name='_Z12cpp_includedP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_includedP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- bool -->
@@ -7456,7 +7438,7 @@ 
     <!-- bool cpp_included_before(cpp_reader*, const char*, source_location) -->
     <function-decl name='cpp_included_before' mangled-name='_Z19cpp_included_beforeP10cpp_readerPKcj' filepath='../.././libcpp/files.c' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_included_beforeP10cpp_readerPKcj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='fname' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7467,28 +7449,28 @@ 
     <!-- void _cpp_init_files(cpp_reader*) -->
     <function-decl name='_cpp_init_files' mangled-name='_cpp_init_files' filepath='../.././libcpp/files.c' line='1170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_files'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void _cpp_cleanup_files(cpp_reader*) -->
     <function-decl name='_cpp_cleanup_files' mangled-name='_cpp_cleanup_files' filepath='../.././libcpp/files.c' line='1187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_cleanup_files'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void cpp_clear_file_cache(cpp_reader*) -->
     <function-decl name='cpp_clear_file_cache' mangled-name='_Z20cpp_clear_file_cacheP10cpp_reader' filepath='../.././libcpp/files.c' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_clear_file_cacheP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void cpp_make_system_header(cpp_reader*, int, int) -->
     <function-decl name='cpp_make_system_header' mangled-name='_Z22cpp_make_system_headerP10cpp_readerii' filepath='../.././libcpp/files.c' line='1219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_make_system_headerP10cpp_readerii'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'int' -->
@@ -7499,7 +7481,7 @@ 
     <!-- void cpp_change_file(cpp_reader*, lc_reason, const char*) -->
     <function-decl name='cpp_change_file' mangled-name='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc' filepath='../.././libcpp/files.c' line='1236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-108' name='reason' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -7510,14 +7492,14 @@ 
     <!-- void _cpp_report_missing_guards(cpp_reader*) -->
     <function-decl name='_cpp_report_missing_guards' mangled-name='_cpp_report_missing_guards' filepath='../.././libcpp/files.c' line='1289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_report_missing_guards'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- bool cpp_push_include(cpp_reader*, const char*) -->
     <function-decl name='cpp_push_include' mangled-name='_Z16cpp_push_includeP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_push_includeP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- bool -->
@@ -7526,11 +7508,11 @@ 
     <!-- void cpp_set_include_chains(cpp_reader*, cpp_dir*, cpp_dir*, int) -->
     <function-decl name='cpp_set_include_chains' mangled-name='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i' filepath='../.././libcpp/files.c' line='1393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-288' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-287' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-288' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-287' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='quote_ignores_source_dir' filepath='../.././libcpp/files.c' line='1394' column='1'/>
       <!-- void -->
@@ -7539,42 +7521,42 @@ 
     <!-- const char* cpp_get_path(_cpp_file*) -->
     <function-decl name='cpp_get_path' mangled-name='_Z12cpp_get_pathP9_cpp_file' filepath='../.././libcpp/files.c' line='1603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_pathP9_cpp_file'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-290'/>
+      <parameter type-id='type-id-289'/>
       <!-- const char* -->
       <return type-id='type-id-15'/>
     </function-decl>
     <!-- cpp_dir* cpp_get_dir(_cpp_file*) -->
     <function-decl name='cpp_get_dir' mangled-name='_Z11cpp_get_dirP9_cpp_file' filepath='../.././libcpp/files.c' line='1611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_get_dirP9_cpp_file'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-290' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
+      <parameter type-id='type-id-289' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
       <!-- cpp_dir* -->
-      <return type-id='type-id-288'/>
+      <return type-id='type-id-287'/>
     </function-decl>
     <!-- cpp_buffer* cpp_get_buffer(cpp_reader*) -->
     <function-decl name='cpp_get_buffer' mangled-name='_Z14cpp_get_bufferP10cpp_reader' filepath='../.././libcpp/files.c' line='1620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_get_bufferP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-282'/>
+      <return type-id='type-id-281'/>
     </function-decl>
     <!-- _cpp_file* cpp_get_file(cpp_buffer*) -->
     <function-decl name='cpp_get_file' mangled-name='_Z12cpp_get_fileP10cpp_buffer' filepath='../.././libcpp/files.c' line='1628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_fileP10cpp_buffer'>
       <!-- parameter of type 'cpp_buffer*' -->
-      <parameter type-id='type-id-282'/>
+      <parameter type-id='type-id-281'/>
       <!-- _cpp_file* -->
-      <return type-id='type-id-290'/>
+      <return type-id='type-id-289'/>
     </function-decl>
     <!-- cpp_buffer* cpp_get_prev(cpp_buffer*) -->
     <function-decl name='cpp_get_prev' mangled-name='_Z12cpp_get_prevP10cpp_buffer' filepath='../.././libcpp/files.c' line='1637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_prevP10cpp_buffer'>
       <!-- parameter of type 'cpp_buffer*' -->
-      <parameter type-id='type-id-282' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
+      <parameter type-id='type-id-281' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-282'/>
+      <return type-id='type-id-281'/>
     </function-decl>
     <!-- bool _cpp_save_file_entries(cpp_reader*, FILE*) -->
     <function-decl name='_cpp_save_file_entries' mangled-name='_cpp_save_file_entries' filepath='../.././libcpp/files.c' line='1684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_file_entries'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- bool -->
@@ -7583,7 +7565,7 @@ 
     <!-- bool _cpp_read_file_entries(cpp_reader*, FILE*) -->
     <function-decl name='_cpp_read_file_entries' mangled-name='_cpp_read_file_entries' filepath='../.././libcpp/files.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_file_entries'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- bool -->
@@ -7646,56 +7628,56 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- typedef ssize_t -->
-      <return type-id='type-id-400'/>
+      <return type-id='type-id-399'/>
     </function-decl>
     <!-- unsigned char* _cpp_convert_input(cpp_reader*, const char*, unsigned char*, size_t, size_t, const unsigned char**, off_t*) -->
     <function-decl name='_cpp_convert_input' filepath='../.././libcpp/internal.h' line='727' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-281'/>
+      <parameter type-id='type-id-280'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-267'/>
+      <parameter type-id='type-id-266'/>
       <!-- parameter of type 'off_t*' -->
-      <parameter type-id='type-id-268'/>
+      <parameter type-id='type-id-267'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-281'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- DIR* opendir(const char*) -->
     <function-decl name='opendir' filepath='/usr/include/dirent.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- DIR* -->
-      <return type-id='type-id-407'/>
+      <return type-id='type-id-406'/>
     </function-decl>
     <!-- dirent* readdir(DIR*) -->
     <function-decl name='readdir' filepath='/usr/include/dirent.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'DIR*' -->
-      <parameter type-id='type-id-407'/>
+      <parameter type-id='type-id-406'/>
       <!-- dirent* -->
-      <return type-id='type-id-408'/>
+      <return type-id='type-id-407'/>
     </function-decl>
     <!-- int closedir(DIR*) -->
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'DIR*' -->
-      <parameter type-id='type-id-407'/>
+      <parameter type-id='type-id-406'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- void* htab_find_with_hash(htab_t, void*, hashval_t) -->
     <function-decl name='htab_find_with_hash' filepath='../.././libcpp/../include/hashtab.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-227'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-226'/>
+      <parameter type-id='type-id-225'/>
       <!-- void* -->
       <return type-id='type-id-14'/>
     </function-decl>
@@ -7710,7 +7692,7 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-404'/>
+      <parameter type-id='type-id-403'/>
       <!-- void* -->
       <return type-id='type-id-14'/>
     </function-decl>
@@ -7719,22 +7701,22 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-230'/>
+      <parameter type-id='type-id-229'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-232'/>
+      <parameter type-id='type-id-231'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-233'/>
+      <parameter type-id='type-id-232'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-235'/>
+      <parameter type-id='type-id-234'/>
       <!-- parameter of type 'typedef htab_free' -->
-      <parameter type-id='type-id-236'/>
+      <parameter type-id='type-id-235'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-227'/>
     </function-decl>
     <!-- void htab_delete(htab_t) -->
     <function-decl name='htab_delete' filepath='../.././libcpp/../include/hashtab.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-227'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -7747,23 +7729,23 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-404'/>
+      <parameter type-id='type-id-403'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- size_t htab_elements(htab_t) -->
     <function-decl name='htab_elements' filepath='../.././libcpp/../include/hashtab.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-227'/>
       <!-- typedef size_t -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void htab_traverse(htab_t, htab_trav, void*) -->
     <function-decl name='htab_traverse' filepath='../.././libcpp/../include/hashtab.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-227'/>
       <!-- parameter of type 'typedef htab_trav' -->
-      <parameter type-id='type-id-406'/>
+      <parameter type-id='type-id-405'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- void -->
@@ -7801,7 +7783,7 @@ 
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- int (void**, void*) -->
-    <function-type size-in-bits='64' id='type-id-409'>
+    <function-type size-in-bits='64' id='type-id-408'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-100'/>
       <!-- parameter of type 'void*' -->
@@ -7810,24 +7792,24 @@ 
       <return type-id='type-id-18'/>
     </function-type>
     <!-- struct __dirstream -->
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-401'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-400'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef int (cpp_reader*, typedef hashnode, void*)* ht_cb -->
-    <typedef-decl name='ht_cb' type-id='type-id-410' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-411'/>
+    <typedef-decl name='ht_cb' type-id='type-id-409' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-410'/>
     <!-- int (cpp_reader*, typedef hashnode, void*)* -->
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-410'/>
+    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-409'/>
     <!-- void _cpp_destroy_hashtable(cpp_reader*) -->
     <function-decl name='_cpp_destroy_hashtable' mangled-name='_cpp_destroy_hashtable' filepath='../.././libcpp/identifiers.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_hashtable'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- cpp_hashnode* cpp_lookup(cpp_reader*, const unsigned char*, unsigned int) -->
     <function-decl name='cpp_lookup' mangled-name='_Z10cpp_lookupP10cpp_readerPKhj' filepath='../.././libcpp/identifiers.c' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_lookupP10cpp_readerPKhj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'unsigned int' -->
@@ -7838,16 +7820,16 @@ 
     <!-- void _cpp_init_hashtable(cpp_reader*, hash_table*) -->
     <function-decl name='_cpp_init_hashtable' mangled-name='_cpp_init_hashtable' filepath='../.././libcpp/identifiers.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_hashtable'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-412' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- int cpp_defined(cpp_reader*, const unsigned char*, int) -->
     <function-decl name='cpp_defined' mangled-name='_Z11cpp_definedP10cpp_readerPKhi' filepath='../.././libcpp/identifiers.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_definedP10cpp_readerPKhi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- parameter of type 'int' -->
@@ -7858,88 +7840,88 @@ 
     <!-- void cpp_forall_identifiers(cpp_reader*, cpp_cb, void*) -->
     <function-decl name='cpp_forall_identifiers' mangled-name='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_' filepath='../.././libcpp/identifiers.c' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef cpp_cb' -->
-      <parameter type-id='type-id-393'/>
+      <parameter type-id='type-id-392'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- int (cpp_reader*, hashnode, void*) -->
-    <function-type size-in-bits='64' id='type-id-412'>
+    <function-type size-in-bits='64' id='type-id-411'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef hashnode' -->
-      <parameter type-id='type-id-379'/>
+      <parameter type-id='type-id-378'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-type>
     <!-- hash_table* -->
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-412'/>
     <!-- typedef ht hash_table -->
-    <typedef-decl name='hash_table' type-id='type-id-315' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-414'/>
+    <typedef-decl name='hash_table' type-id='type-id-314' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- const unsigned char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='2048' id='type-id-415'>
+    <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='2048' id='type-id-414'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-4' id='type-id-398'/>
+      <subrange length='256' type-id='type-id-4' id='type-id-397'/>
     </array-type-def>
     <!-- unsigned char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-27' size-in-bits='2048' id='type-id-416'>
+    <array-type-def dimensions='1' type-id='type-id-27' size-in-bits='2048' id='type-id-415'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-4' id='type-id-398'/>
+      <subrange length='256' type-id='type-id-4' id='type-id-397'/>
     </array-type-def>
     <!-- void cpp_set_lang(cpp_reader*, c_lang) -->
     <function-decl name='cpp_set_lang' mangled-name='_Z12cpp_set_langP10cpp_reader6c_lang' filepath='../.././libcpp/init.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_set_langP10cpp_reader6c_lang'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-345' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-344' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- cpp_reader* cpp_create_reader(c_lang, hash_table*, line_maps*) -->
     <function-decl name='cpp_create_reader' mangled-name='_Z17cpp_create_reader6c_langP2htP9line_maps' filepath='../.././libcpp/init.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_create_reader6c_langP2htP9line_maps'>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-345' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-344' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-412' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
+      <parameter type-id='type-id-196' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
       <!-- cpp_reader* -->
-      <return type-id='type-id-259'/>
+      <return type-id='type-id-258'/>
     </function-decl>
     <!-- void cpp_set_line_map(cpp_reader*, line_maps*) -->
     <function-decl name='cpp_set_line_map' mangled-name='_Z16cpp_set_line_mapP10cpp_readerP9line_maps' filepath='../.././libcpp/init.c' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_set_line_mapP10cpp_readerP9line_maps'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-196' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void cpp_destroy(cpp_reader*) -->
     <function-decl name='cpp_destroy' mangled-name='_Z11cpp_destroyP10cpp_reader' filepath='../.././libcpp/init.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_destroyP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void cpp_init_special_builtins(cpp_reader*) -->
     <function-decl name='cpp_init_special_builtins' mangled-name='_Z25cpp_init_special_builtinsP10cpp_reader' filepath='../.././libcpp/init.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_init_special_builtinsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void cpp_init_builtins(cpp_reader*, int) -->
     <function-decl name='cpp_init_builtins' mangled-name='_Z17cpp_init_builtinsP10cpp_readeri' filepath='../.././libcpp/init.c' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_init_builtinsP10cpp_readeri'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- void -->
@@ -7948,14 +7930,14 @@ 
     <!-- void cpp_post_options(cpp_reader*) -->
     <function-decl name='cpp_post_options' mangled-name='_Z16cpp_post_optionsP10cpp_reader' filepath='../.././libcpp/init.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_post_optionsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- const char* cpp_read_main_file(cpp_reader*, const char*) -->
     <function-decl name='cpp_read_main_file' mangled-name='_Z18cpp_read_main_fileP10cpp_readerPKc' filepath='../.././libcpp/init.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_read_main_fileP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='fname' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <!-- const char* -->
@@ -7964,21 +7946,21 @@ 
     <!-- void cpp_finish(cpp_reader*, FILE*) -->
     <function-decl name='cpp_finish' mangled-name='_Z10cpp_finishP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/init.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_finishP10cpp_readerP8_IO_FILE'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- unsigned char _cpp_trigraph_map[256] -->
-    <var-decl name='_cpp_trigraph_map' type-id='type-id-416' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
+    <var-decl name='_cpp_trigraph_map' type-id='type-id-415' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/lex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- struct normalize_state -->
-    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-274'>
+    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cppchar_t normalize_state::previous -->
-        <var-decl name='previous' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- unsigned char normalize_state::prev_class -->
@@ -7986,13 +7968,13 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_normalize_level normalize_state::level -->
-        <var-decl name='level' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_context cpp_context -->
-    <typedef-decl name='cpp_context' type-id='type-id-285' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-417'/>
+    <typedef-decl name='cpp_context' type-id='type-id-284' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-416'/>
     <!-- enum cpp_token_fld_kind -->
-    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-418'>
+    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-417'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CPP_TOKEN_FLD_NODE' value='0'/>
       <enumerator name='CPP_TOKEN_FLD_SOURCE' value='1'/>
@@ -8003,13 +7985,13 @@ 
       <enumerator name='CPP_TOKEN_FLD_NONE' value='6'/>
     </enum-decl>
     <!-- cpp_comment_table* -->
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-419'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-418'/>
     <!-- normalize_state* -->
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-260'/>
     <!-- int cpp_ideq(const cpp_token*, const char*) -->
     <function-decl name='cpp_ideq' mangled-name='_Z8cpp_ideqPK9cpp_tokenPKc' filepath='../.././libcpp/lex.c' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8cpp_ideqPK9cpp_tokenPKc'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
+      <parameter type-id='type-id-263' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='string' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <!-- int -->
@@ -8023,14 +8005,14 @@ 
     <!-- cpp_comment_table* cpp_get_comments(cpp_reader*) -->
     <function-decl name='cpp_get_comments' mangled-name='_Z16cpp_get_commentsP10cpp_reader' filepath='../.././libcpp/lex.c' line='1627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_get_commentsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
       <!-- cpp_comment_table* -->
-      <return type-id='type-id-419'/>
+      <return type-id='type-id-418'/>
     </function-decl>
     <!-- void _cpp_init_tokenrun(tokenrun*, unsigned int) -->
     <function-decl name='_cpp_init_tokenrun' mangled-name='_cpp_init_tokenrun' filepath='../.././libcpp/lex.c' line='1721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_tokenrun'>
       <!-- parameter of type 'tokenrun*' -->
-      <parameter type-id='type-id-294' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
+      <parameter type-id='type-id-293' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='count' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <!-- void -->
@@ -8039,29 +8021,29 @@ 
     <!-- int _cpp_remaining_tokens_num_in_context(cpp_context*) -->
     <function-decl name='_cpp_remaining_tokens_num_in_context' mangled-name='_cpp_remaining_tokens_num_in_context' filepath='../.././libcpp/lex.c' line='1745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remaining_tokens_num_in_context'>
       <!-- parameter of type 'cpp_context*' -->
-      <parameter type-id='type-id-286' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
+      <parameter type-id='type-id-285' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- unsigned int cpp_token_len(const cpp_token*) -->
     <function-decl name='cpp_token_len' mangled-name='_Z13cpp_token_lenPK9cpp_token' filepath='../.././libcpp/lex.c' line='2355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_token_lenPK9cpp_token'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264'/>
+      <parameter type-id='type-id-263'/>
       <!-- unsigned int -->
       <return type-id='type-id-13'/>
     </function-decl>
     <!-- unsigned char* cpp_spell_token(cpp_reader*, const cpp_token*, unsigned char*, bool) -->
     <function-decl name='cpp_spell_token' mangled-name='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb' filepath='../.././libcpp/lex.c' line='2418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264'/>
+      <parameter type-id='type-id-263'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-281'/>
+      <parameter type-id='type-id-280'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-1'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-281'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- const char* cpp_type2name(cpp_ttype, unsigned char) -->
     <function-decl name='cpp_type2name' mangled-name='_Z13cpp_type2name9cpp_ttypeh' filepath='../.././libcpp/lex.c' line='2496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_type2name9cpp_ttypeh'>
@@ -8075,7 +8057,7 @@ 
     <!-- void cpp_output_token(const cpp_token*, FILE*) -->
     <function-decl name='cpp_output_token' mangled-name='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
+      <parameter type-id='type-id-263' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='fp' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <!-- void -->
@@ -8084,18 +8066,18 @@ 
     <!-- int cpp_avoid_paste(cpp_reader*, const cpp_token*, const cpp_token*) -->
     <function-decl name='cpp_avoid_paste' mangled-name='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_' filepath='../.././libcpp/lex.c' line='2592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-263' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
+      <parameter type-id='type-id-263' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- void cpp_output_line(cpp_reader*, FILE*) -->
     <function-decl name='cpp_output_line' mangled-name='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- void -->
@@ -8104,41 +8086,41 @@ 
     <!-- unsigned char* cpp_output_line_to_string(cpp_reader*, const unsigned char*) -->
     <function-decl name='cpp_output_line_to_string' mangled-name='_Z25cpp_output_line_to_stringP10cpp_readerPKh' filepath='../.././libcpp/lex.c' line='2669' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_output_line_to_stringP10cpp_readerPKh'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-281'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- unsigned char* cpp_token_as_text(cpp_reader*, const cpp_token*) -->
     <function-decl name='cpp_token_as_text' mangled-name='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token' filepath='../.././libcpp/lex.c' line='2481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264'/>
+      <parameter type-id='type-id-263'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-281'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- const cpp_token* cpp_peek_token(cpp_reader*, int) -->
     <function-decl name='cpp_peek_token' mangled-name='_Z14cpp_peek_tokenP10cpp_readeri' filepath='../.././libcpp/lex.c' line='1772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_peek_tokenP10cpp_readeri'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-264'/>
+      <return type-id='type-id-263'/>
     </function-decl>
     <!-- cpp_token_fld_kind cpp_token_val_index(cpp_token*) -->
     <function-decl name='cpp_token_val_index' mangled-name='_Z19cpp_token_val_indexP9cpp_token' filepath='../.././libcpp/lex.c' line='2879' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_token_val_indexP9cpp_token'>
       <!-- parameter of type 'cpp_token*' -->
       <parameter type-id='type-id-164' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
       <!-- enum cpp_token_fld_kind -->
-      <return type-id='type-id-418'/>
+      <return type-id='type-id-417'/>
     </function-decl>
     <!-- void cpp_force_token_locations(cpp_reader*, source_location*) -->
     <function-decl name='cpp_force_token_locations' mangled-name='_Z25cpp_force_token_locationsP10cpp_readerPj' filepath='../.././libcpp/lex.c' line='2910' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_force_token_locationsP10cpp_readerPj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
+      <parameter type-id='type-id-258' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <!-- parameter of type 'source_location*' -->
       <parameter type-id='type-id-117' name='p' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <!-- void -->
@@ -8147,29 +8129,29 @@ 
     <!-- void cpp_stop_forcing_token_locations(cpp_reader*) -->
     <function-decl name='cpp_stop_forcing_token_locations' mangled-name='_Z32cpp_stop_forcing_token_locationsP10cpp_reader' filepath='../.././libcpp/lex.c' line='2918' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_stop_forcing_token_locationsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- cppchar_t _cpp_valid_ucn(cpp_reader*, const unsigned char**, const unsigned char*, int, normalize_state*) -->
     <function-decl name='_cpp_valid_ucn' filepath='../.././libcpp/internal.h' line='723' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-267'/>
+      <parameter type-id='type-id-266'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'normalize_state*' -->
-      <parameter type-id='type-id-261'/>
+      <parameter type-id='type-id-260'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-260'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <!-- cpp_hashnode* _cpp_interpret_identifier(cpp_reader*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_interpret_identifier' filepath='../.././libcpp/internal.h' line='731' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -8294,7 +8276,7 @@ 
     <!-- typedef cpp_macro cpp_macro -->
     <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
     <!-- typedef cpp_token cpp_token -->
-    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-277'/>
+    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-276'/>
     <!-- struct cpp_identifier -->
     <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -8303,7 +8285,7 @@ 
       </data-member>
     </class-decl>
     <!-- typedef cpp_hashnode cpp_hashnode -->
-    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-352'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-351'/>
     <!-- struct cpp_macro_arg -->
     <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -8519,21 +8501,21 @@ 
     <!-- void linemap_init(line_maps*) -->
     <function-decl name='linemap_init' mangled-name='_Z12linemap_initP9line_maps' filepath='../.././libcpp/line-map.c' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_initP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void linemap_check_files_exited(line_maps*) -->
     <function-decl name='linemap_check_files_exited' mangled-name='_Z26linemap_check_files_exitedP9line_maps' filepath='../.././libcpp/line-map.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26linemap_check_files_exitedP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- const line_map* linemap_add(line_maps*, lc_reason, unsigned int, const char*, linenum_type) -->
     <function-decl name='linemap_add' mangled-name='_Z11linemap_addP9line_maps9lc_reasonjPKcj' filepath='../.././libcpp/line-map.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11linemap_addP9line_maps9lc_reasonjPKcj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-108' name='reason' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -8548,14 +8530,14 @@ 
     <!-- bool linemap_tracks_macro_expansion_locs_p(line_maps*) -->
     <function-decl name='linemap_tracks_macro_expansion_locs_p' mangled-name='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps' filepath='../.././libcpp/line-map.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- const line_map* linemap_enter_macro(line_maps*, cpp_hashnode*, source_location, unsigned int) -->
     <function-decl name='linemap_enter_macro' mangled-name='linemap_enter_macro' filepath='../.././libcpp/line-map.c' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_enter_macro'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116' name='macro_node' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -8581,7 +8563,7 @@ 
     <!-- source_location linemap_line_start(line_maps*, linenum_type, unsigned int) -->
     <function-decl name='linemap_line_start' mangled-name='_Z18linemap_line_startP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18linemap_line_startP9line_mapsjj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <!-- parameter of type 'typedef linenum_type' -->
       <parameter type-id='type-id-115' name='to_line' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -8592,7 +8574,7 @@ 
     <!-- source_location linemap_position_for_column(line_maps*, unsigned int) -->
     <function-decl name='linemap_position_for_column' mangled-name='_Z27linemap_position_for_columnP9line_mapsj' filepath='../.././libcpp/line-map.c' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27linemap_position_for_columnP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='to_column' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <!-- typedef source_location -->
@@ -8601,7 +8583,7 @@ 
     <!-- source_location linemap_position_for_line_and_column(line_map*, linenum_type, unsigned int) -->
     <function-decl name='linemap_position_for_line_and_column' mangled-name='_Z36linemap_position_for_line_and_columnP8line_mapjj' filepath='../.././libcpp/line-map.c' line='495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z36linemap_position_for_line_and_columnP8line_mapjj'>
       <!-- parameter of type 'line_map*' -->
-      <parameter type-id='type-id-190' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
+      <parameter type-id='type-id-189' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
       <!-- parameter of type 'typedef linenum_type' -->
       <parameter type-id='type-id-115' name='line' filepath='../.././libcpp/line-map.c' line='496' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -8612,7 +8594,7 @@ 
     <!-- const line_map* linemap_lookup(line_maps*, source_location) -->
     <function-decl name='linemap_lookup' mangled-name='_Z14linemap_lookupP9line_mapsj' filepath='../.././libcpp/line-map.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14linemap_lookupP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103' name='line' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <!-- const line_map* -->
@@ -8628,7 +8610,7 @@ 
     <!-- int linemap_get_expansion_line(line_maps*, source_location) -->
     <function-decl name='linemap_get_expansion_line' mangled-name='linemap_get_expansion_line' filepath='../.././libcpp/line-map.c' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_line'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197'/>
+      <parameter type-id='type-id-196'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- int -->
@@ -8637,7 +8619,7 @@ 
     <!-- const char* linemap_get_expansion_filename(line_maps*, source_location) -->
     <function-decl name='linemap_get_expansion_filename' mangled-name='linemap_get_expansion_filename' filepath='../.././libcpp/line-map.c' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_filename'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103' name='location' filepath='../.././libcpp/line-map.c' line='720' column='1'/>
       <!-- const char* -->
@@ -8653,7 +8635,7 @@ 
     <!-- bool linemap_location_from_macro_expansion_p(line_maps*, source_location) -->
     <function-decl name='linemap_location_from_macro_expansion_p' mangled-name='_Z39linemap_location_from_macro_expansion_pP9line_mapsj' filepath='../.././libcpp/line-map.c' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z39linemap_location_from_macro_expansion_pP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103' name='location' filepath='../.././libcpp/line-map.c' line='773' column='1'/>
       <!-- bool -->
@@ -8662,20 +8644,20 @@ 
     <!-- source_location linemap_resolve_location(line_maps*, source_location, location_resolution_kind, const line_map**) -->
     <function-decl name='linemap_resolve_location' mangled-name='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map' filepath='../.././libcpp/line-map.c' line='1048' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197'/>
+      <parameter type-id='type-id-196'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- parameter of type 'enum location_resolution_kind' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-192'/>
       <!-- parameter of type 'const line_map**' -->
-      <parameter type-id='type-id-196'/>
+      <parameter type-id='type-id-195'/>
       <!-- typedef source_location -->
       <return type-id='type-id-103'/>
     </function-decl>
     <!-- int linemap_compare_locations(line_maps*, source_location, source_location) -->
     <function-decl name='linemap_compare_locations' mangled-name='_Z25linemap_compare_locationsP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25linemap_compare_locationsP9line_mapsjj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197'/>
+      <parameter type-id='type-id-196'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -8686,7 +8668,7 @@ 
     <!-- int linemap_location_in_system_header_p(line_maps*, source_location) -->
     <function-decl name='linemap_location_in_system_header_p' mangled-name='_Z35linemap_location_in_system_header_pP9line_mapsj' filepath='../.././libcpp/line-map.c' line='753' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z35linemap_location_in_system_header_pP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197'/>
+      <parameter type-id='type-id-196'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- int -->
@@ -8695,31 +8677,31 @@ 
     <!-- source_location linemap_unwind_toward_expansion(line_maps*, source_location, const line_map**) -->
     <function-decl name='linemap_unwind_toward_expansion' mangled-name='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map' filepath='../.././libcpp/line-map.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103' name='loc' filepath='../.././libcpp/line-map.c' line='1094' column='1'/>
       <!-- parameter of type 'const line_map**' -->
-      <parameter type-id='type-id-196' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
+      <parameter type-id='type-id-195' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
       <!-- typedef source_location -->
       <return type-id='type-id-103'/>
     </function-decl>
     <!-- expanded_location linemap_expand_location(line_maps*, const line_map*, source_location) -->
     <function-decl name='linemap_expand_location' mangled-name='_Z23linemap_expand_locationP9line_mapsPK8line_mapj' filepath='../.././libcpp/line-map.c' line='1120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23linemap_expand_locationP9line_mapsPK8line_mapj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197'/>
+      <parameter type-id='type-id-196'/>
       <!-- parameter of type 'const line_map*' -->
       <parameter type-id='type-id-48'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- typedef expanded_location -->
-      <return type-id='type-id-195'/>
+      <return type-id='type-id-194'/>
     </function-decl>
     <!-- void linemap_dump(FILE*, line_maps*, unsigned int, bool) -->
     <function-decl name='linemap_dump' mangled-name='_Z12linemap_dumpP8_IO_FILEP9line_mapsjb' filepath='../.././libcpp/line-map.c' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_dumpP8_IO_FILEP9line_mapsjb'>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='stream' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='ix' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'bool' -->
@@ -8730,7 +8712,7 @@ 
     <!-- void linemap_dump_location(line_maps*, source_location, FILE*) -->
     <function-decl name='linemap_dump_location' mangled-name='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE' filepath='../.././libcpp/line-map.c' line='1211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103' name='loc' filepath='../.././libcpp/line-map.c' line='1212' column='1'/>
       <!-- parameter of type 'FILE*' -->
@@ -8741,9 +8723,9 @@ 
     <!-- void linemap_get_statistics(line_maps*, linemap_stats*) -->
     <function-decl name='linemap_get_statistics' mangled-name='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats' filepath='../.././libcpp/line-map.c' line='1254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197'/>
+      <parameter type-id='type-id-196'/>
       <!-- parameter of type 'linemap_stats*' -->
-      <parameter type-id='type-id-203'/>
+      <parameter type-id='type-id-202'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -8752,7 +8734,7 @@ 
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='stream' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
+      <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='num_ordinary' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -8772,7 +8754,7 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/macro.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- struct _cpp_file -->
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-307'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-306'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* _cpp_file::name -->
         <var-decl name='name' type-id='type-id-15' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
@@ -8791,23 +8773,23 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_file* _cpp_file::next_file -->
-        <var-decl name='next_file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- const uchar* _cpp_file::buffer -->
-        <var-decl name='buffer' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- const uchar* _cpp_file::buffer_start -->
-        <var-decl name='buffer_start' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-256' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- const cpp_hashnode* _cpp_file::cmacro -->
-        <var-decl name='cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_dir* _cpp_file::dir -->
-        <var-decl name='dir' type-id='type-id-288' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-287' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- stat _cpp_file::st -->
@@ -8843,21 +8825,21 @@ 
       </data-member>
     </class-decl>
     <!-- struct cpp_reader -->
-    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-279'>
+    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-278'>
       <member-type access='public'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-280'>
+        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-279'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned char* base -->
-            <var-decl name='base' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- unsigned char* limit -->
-            <var-decl name='limit' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- unsigned char* cur -->
-            <var-decl name='cur' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- source_location first_line -->
@@ -8867,19 +8849,19 @@ 
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_buffer* cpp_reader::buffer -->
-        <var-decl name='buffer' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_buffer* cpp_reader::overlaid_buffer -->
-        <var-decl name='overlaid_buffer' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- lexer_state cpp_reader::state -->
-        <var-decl name='state' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- line_maps* cpp_reader::line_table -->
-        <var-decl name='line_table' type-id='type-id-197' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-196' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- source_location cpp_reader::directive_line -->
@@ -8887,31 +8869,31 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- _cpp_buff* cpp_reader::a_buff -->
-        <var-decl name='a_buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- _cpp_buff* cpp_reader::u_buff -->
-        <var-decl name='u_buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_buff* cpp_reader::free_buffs -->
-        <var-decl name='free_buffs' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- cpp_context cpp_reader::base_context -->
-        <var-decl name='base_context' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- cpp_context* cpp_reader::context -->
-        <var-decl name='context' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- const directive* cpp_reader::directive -->
-        <var-decl name='directive' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- cpp_token cpp_reader::directive_result -->
-        <var-decl name='directive_result' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- source_location cpp_reader::invocation_location -->
@@ -8923,39 +8905,39 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- cpp_dir* cpp_reader::quote_include -->
-        <var-decl name='quote_include' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- cpp_dir* cpp_reader::bracket_include -->
-        <var-decl name='bracket_include' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- cpp_dir cpp_reader::no_search_path -->
-        <var-decl name='no_search_path' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
         <!-- _cpp_file* cpp_reader::all_files -->
-        <var-decl name='all_files' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
         <!-- _cpp_file* cpp_reader::main_file -->
-        <var-decl name='main_file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- htab* cpp_reader::file_hash -->
-        <var-decl name='file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <!-- htab* cpp_reader::dir_hash -->
-        <var-decl name='dir_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- file_hash_entry_pool* cpp_reader::file_hash_entries -->
-        <var-decl name='file_hash_entries' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <!-- htab* cpp_reader::nonexistent_file_hash -->
-        <var-decl name='nonexistent_file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <!-- obstack cpp_reader::nonexistent_file_ob -->
@@ -8971,11 +8953,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
         <!-- const cpp_hashnode* cpp_reader::mi_cmacro -->
-        <var-decl name='mi_cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
         <!-- const cpp_hashnode* cpp_reader::mi_ind_cmacro -->
-        <var-decl name='mi_ind_cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <!-- bool cpp_reader::mi_valid -->
@@ -8987,11 +8969,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <!-- tokenrun cpp_reader::base_run -->
-        <var-decl name='base_run' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <!-- tokenrun* cpp_reader::cur_run -->
-        <var-decl name='cur_run' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <!-- unsigned int cpp_reader::lookaheads -->
@@ -9003,7 +8985,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <!-- unsigned char* cpp_reader::macro_buffer -->
-        <var-decl name='macro_buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <!-- unsigned int cpp_reader::macro_buffer_len -->
@@ -9011,23 +8993,23 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
         <!-- cset_converter cpp_reader::narrow_cset_desc -->
-        <var-decl name='narrow_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
         <!-- cset_converter cpp_reader::utf8_cset_desc -->
-        <var-decl name='utf8_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
         <!-- cset_converter cpp_reader::char16_cset_desc -->
-        <var-decl name='char16_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
         <!-- cset_converter cpp_reader::char32_cset_desc -->
-        <var-decl name='char32_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
         <!-- cset_converter cpp_reader::wide_cset_desc -->
-        <var-decl name='wide_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <!-- const unsigned char* cpp_reader::date -->
@@ -9039,15 +9021,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
         <!-- cpp_token cpp_reader::avoid_paste -->
-        <var-decl name='avoid_paste' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
         <!-- cpp_token cpp_reader::eof -->
-        <var-decl name='eof' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <!-- deps* cpp_reader::deps -->
-        <var-decl name='deps' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <!-- obstack cpp_reader::hash_ob -->
@@ -9059,31 +9041,31 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
         <!-- pragma_entry* cpp_reader::pragmas -->
-        <var-decl name='pragmas' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
         <!-- cpp_callbacks cpp_reader::cb -->
-        <var-decl name='cb' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
         <!-- ht* cpp_reader::hash_table -->
-        <var-decl name='hash_table' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
         <!-- op* cpp_reader::op_stack -->
-        <var-decl name='op_stack' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
         <!-- op* cpp_reader::op_limit -->
-        <var-decl name='op_limit' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
         <!-- cpp_options cpp_reader::opts -->
-        <var-decl name='opts' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
         <!-- spec_nodes cpp_reader::spec_nodes -->
-        <var-decl name='spec_nodes' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <!-- bool cpp_reader::our_hashtable -->
@@ -9091,7 +9073,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} cpp_reader::out -->
-        <var-decl name='out' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <!-- const unsigned char* cpp_reader::saved_cur -->
@@ -9107,7 +9089,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
         <!-- cpp_savedstate* cpp_reader::savedstate -->
-        <var-decl name='savedstate' type-id='type-id-303' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <!-- unsigned int cpp_reader::counter -->
@@ -9115,11 +9097,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <!-- cpp_comment_table cpp_reader::comments -->
-        <var-decl name='comments' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-303' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <!-- def_pragma_macro* cpp_reader::pushed_macros -->
-        <var-decl name='pushed_macros' type-id='type-id-305' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <!-- source_location* cpp_reader::forced_token_location_p -->
@@ -9127,10 +9109,10 @@ 
       </data-member>
     </class-decl>
     <!-- struct deps -->
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-313'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char** deps::targetv -->
-        <var-decl name='targetv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int deps::ntargets -->
@@ -9142,7 +9124,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char** deps::depv -->
-        <var-decl name='depv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned int deps::ndeps -->
@@ -9154,11 +9136,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** deps::vpathv -->
-        <var-decl name='vpathv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- size_t* deps::vpathlv -->
-        <var-decl name='vpathlv' type-id='type-id-212' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-211' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int deps::nvpaths -->
@@ -9170,11 +9152,11 @@ 
       </data-member>
     </class-decl>
     <!-- typedef cpp_buffer cpp_buffer -->
-    <typedef-decl name='cpp_buffer' type-id='type-id-310' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-420'/>
+    <typedef-decl name='cpp_buffer' type-id='type-id-309' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-419'/>
     <!-- typedef _cpp_line_note _cpp_line_note -->
-    <typedef-decl name='_cpp_line_note' type-id='type-id-385' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-375'/>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-374'/>
     <!-- struct _cpp_line_note -->
-    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-385'>
+    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* _cpp_line_note::pos -->
         <var-decl name='pos' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
@@ -9185,10 +9167,10 @@ 
       </data-member>
     </class-decl>
     <!-- struct cpp_dir -->
-    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-289'>
+    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-288'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_dir* cpp_dir::next -->
-        <var-decl name='next' type-id='type-id-288' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-287' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* cpp_dir::name -->
@@ -9212,34 +9194,34 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** cpp_dir::name_map -->
-        <var-decl name='name_map' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
-        <var-decl name='construct' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- ino_t cpp_dir::ino -->
-        <var-decl name='ino' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- dev_t cpp_dir::dev -->
-        <var-decl name='dev' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef __ino_t ino_t -->
-    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-341'/>
+    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-340'/>
     <!-- typedef __dev_t dev_t -->
-    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-342'/>
+    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-341'/>
     <!-- struct cset_converter -->
-    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-295'>
+    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- convert_f cset_converter::func -->
-        <var-decl name='func' type-id='type-id-346' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- iconv_t cset_converter::cd -->
-        <var-decl name='cd' type-id='type-id-209' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-208' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int cset_converter::width -->
@@ -9247,9 +9229,9 @@ 
       </data-member>
     </class-decl>
     <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
-    <typedef-decl name='convert_f' type-id='type-id-363' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-346'/>
+    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-345'/>
     <!-- struct lexer_state -->
-    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-283'>
+    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-282'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned char lexer_state::in_directive -->
         <var-decl name='in_directive' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
@@ -9308,22 +9290,22 @@ 
       </data-member>
     </class-decl>
     <!-- struct ht -->
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-315'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-314'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- obstack ht::stack -->
         <var-decl name='stack' type-id='type-id-58' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- hashnode* ht::entries -->
-        <var-decl name='entries' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
-        <var-decl name='alloc_node' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void* (typedef size_t)* ht::alloc_subobject -->
-        <var-decl name='alloc_subobject' type-id='type-id-214' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-213' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- unsigned int ht::nslots -->
@@ -9335,7 +9317,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- cpp_reader* ht::pfile -->
-        <var-decl name='pfile' type-id='type-id-259' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-258' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- unsigned int ht::searches -->
@@ -9351,35 +9333,35 @@ 
       </data-member>
     </class-decl>
     <!-- typedef _cpp_buff _cpp_buff -->
-    <typedef-decl name='_cpp_buff' type-id='type-id-306' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-421'/>
+    <typedef-decl name='_cpp_buff' type-id='type-id-305' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-420'/>
     <!-- struct _cpp_buff -->
-    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-306'>
+    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-305'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- _cpp_buff* _cpp_buff::next -->
-        <var-decl name='next' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char* _cpp_buff::base -->
-        <var-decl name='base' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* _cpp_buff::cur -->
-        <var-decl name='cur' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned char* _cpp_buff::limit -->
-        <var-decl name='limit' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct tokenrun -->
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-347'>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-346'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- tokenrun* tokenrun::next -->
-        <var-decl name='next' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- tokenrun* tokenrun::prev -->
-        <var-decl name='prev' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token* tokenrun::base -->
@@ -9391,13 +9373,13 @@ 
       </data-member>
     </class-decl>
     <!-- struct cpp_options -->
-    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-301'>
+    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-300'>
       <member-type access='public'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-343'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-342'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- cpp_deps_style style -->
-            <var-decl name='style' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- bool missing_files -->
@@ -9423,7 +9405,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- c_lang cpp_options::lang -->
-        <var-decl name='lang' type-id='type-id-345' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char cpp_options::cplusplus -->
@@ -9591,7 +9573,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- cpp_normalize_level cpp_options::warn_normalize -->
-        <var-decl name='warn_normalize' type-id='type-id-278' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-277' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- bool cpp_options::warn_invalid_pch -->
@@ -9603,7 +9585,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} cpp_options::deps -->
-        <var-decl name='deps' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- size_t cpp_options::precision -->
@@ -9643,14 +9625,14 @@ 
       </data-member>
     </class-decl>
     <!-- struct op -->
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-316'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-315'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const cpp_token* op::token -->
-        <var-decl name='token' type-id='type-id-264' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num op::value -->
-        <var-decl name='value' type-id='type-id-361' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-360' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- source_location op::loc -->
@@ -9662,26 +9644,26 @@ 
       </data-member>
     </class-decl>
     <!-- struct cpp_context -->
-    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-285'>
+    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-284'>
       <member-type access='public'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-332'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-331'>
           <member-type access='private'>
             <!-- struct {utoken first; utoken last;} -->
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-333'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-332'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- utoken first -->
-                <var-decl name='first' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- utoken last -->
-                <var-decl name='last' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-335'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-334'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- const unsigned char* cur -->
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
@@ -9694,20 +9676,20 @@ 
           </member-type>
           <data-member access='private'>
             <!-- struct {utoken first; utoken last;} iso -->
-            <var-decl name='iso' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
-            <var-decl name='trad' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-336'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-335'>
           <data-member access='private'>
             <!-- macro_context* mc -->
-            <var-decl name='mc' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_hashnode* macro -->
@@ -9717,44 +9699,44 @@ 
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_context* cpp_context::next -->
-        <var-decl name='next' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_context* cpp_context::prev -->
-        <var-decl name='prev' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} cpp_context::u -->
-        <var-decl name='u' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_buff* cpp_context::buff -->
-        <var-decl name='buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} cpp_context::c -->
-        <var-decl name='c' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- context_tokens_kind cpp_context::tokens_kind -->
-        <var-decl name='tokens_kind' type-id='type-id-338' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
     <!-- union utoken -->
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-334'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-333'>
       <data-member access='private'>
         <!-- const cpp_token* utoken::token -->
-        <var-decl name='token' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- const cpp_token** utoken::ptoken -->
-        <var-decl name='ptoken' type-id='type-id-365' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-364' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
     <!-- typedef __anonymous_struct__ macro_context -->
-    <typedef-decl name='macro_context' type-id='type-id-383' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-356'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-355'/>
     <!-- struct {cpp_hashnode* macro_node; source_location* virt_locs; source_location* cur_virt_loc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-383'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* macro_node -->
         <var-decl name='macro_node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
@@ -9769,89 +9751,89 @@ 
       </data-member>
     </class-decl>
     <!-- struct cpp_callbacks -->
-    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-298'>
+    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
-        <var-decl name='line_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
-        <var-decl name='file_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
-        <var-decl name='dir_change' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
-        <var-decl name='include' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
-        <var-decl name='define' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
-        <var-decl name='undef' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
-        <var-decl name='ident' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
-        <var-decl name='def_pragma' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
-        <var-decl name='valid_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
-        <var-decl name='read_pch' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- missing_header_cb cpp_callbacks::missing_header -->
-        <var-decl name='missing_header' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
-        <var-decl name='macro_to_expand' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
-        <var-decl name='error' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
-        <var-decl name='used_define' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
-        <var-decl name='used_undef' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
-        <var-decl name='before_define' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
-        <var-decl name='used' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
-        <var-decl name='user_builtin_macro' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum context_tokens_kind -->
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-338'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-337'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
     <!-- struct cpp_buffer -->
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-310'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-309'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* cpp_buffer::cur -->
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
@@ -9874,7 +9856,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- _cpp_line_note* cpp_buffer::notes -->
-        <var-decl name='notes' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int cpp_buffer::cur_note -->
@@ -9890,11 +9872,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_buffer* cpp_buffer::prev -->
-        <var-decl name='prev' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_file* cpp_buffer::file -->
-        <var-decl name='file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- const unsigned char* cpp_buffer::timestamp -->
@@ -9902,7 +9884,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- if_stack* cpp_buffer::if_stack -->
-        <var-decl name='if_stack' type-id='type-id-358' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool cpp_buffer::need_line -->
@@ -9926,36 +9908,36 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- cpp_dir cpp_buffer::dir -->
-        <var-decl name='dir' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- cset_converter cpp_buffer::input_cset_desc -->
-        <var-decl name='input_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef tokenrun tokenrun -->
-    <typedef-decl name='tokenrun' type-id='type-id-347' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-293'/>
+    <typedef-decl name='tokenrun' type-id='type-id-346' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-292'/>
     <!-- typedef cpp_reader cpp_reader -->
-    <typedef-decl name='cpp_reader' type-id='type-id-279' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-272'/>
+    <typedef-decl name='cpp_reader' type-id='type-id-278' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-271'/>
     <!-- typedef cpp_string cpp_string -->
-    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-273'/>
+    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
     <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
-    <typedef-decl name='missing_header_cb' type-id='type-id-364' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-327'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-326'/>
     <!-- typedef cpp_dir cpp_dir -->
-    <typedef-decl name='cpp_dir' type-id='type-id-289' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-422'/>
+    <typedef-decl name='cpp_dir' type-id='type-id-288' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-421'/>
     <!-- typedef ht_identifier* hashnode -->
-    <typedef-decl name='hashnode' type-id='type-id-387' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-379'/>
+    <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
     <!-- typedef ht hash_table -->
-    <typedef-decl name='hash_table' type-id='type-id-315' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-414'/>
+    <typedef-decl name='hash_table' type-id='type-id-314' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
     <!-- enum cpp_deps_style -->
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-344'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-343'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
     <!-- enum c_lang -->
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-345'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-344'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -9971,7 +9953,7 @@ 
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
     <!-- enum cpp_normalize_level -->
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-278'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-277'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
@@ -9979,7 +9961,7 @@ 
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
     <!-- struct spec_nodes -->
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-302'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-301'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* spec_nodes::n_defined -->
         <var-decl name='n_defined' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
@@ -9998,12 +9980,12 @@ 
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__1 cpp_comment_table -->
-    <typedef-decl name='cpp_comment_table' type-id='type-id-348' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-304'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-347' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-303'/>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-348'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-362' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -10015,9 +9997,9 @@ 
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__2 cpp_comment -->
-    <typedef-decl name='cpp_comment' type-id='type-id-386' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-378'/>
+    <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
     <!-- struct {char* comment; source_location sloc;} -->
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-378' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-386'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-377' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-385'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* comment -->
         <var-decl name='comment' type-id='type-id-51' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
@@ -10028,10 +10010,10 @@ 
       </data-member>
     </class-decl>
     <!-- struct def_pragma_macro -->
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-312'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-311'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- def_pragma_macro* def_pragma_macro::next -->
-        <var-decl name='next' type-id='type-id-305' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* def_pragma_macro::name -->
@@ -10039,7 +10021,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* def_pragma_macro::definition -->
-        <var-decl name='definition' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- source_location def_pragma_macro::line -->
@@ -10059,11 +10041,11 @@ 
       </data-member>
     </class-decl>
     <!-- typedef unsigned char uchar -->
-    <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-276'/>
+    <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-275'/>
     <!-- typedef __time_t time_t -->
-    <typedef-decl name='time_t' type-id='type-id-82' filepath='/usr/include/time.h' line='76' column='1' id='type-id-423'/>
+    <typedef-decl name='time_t' type-id='type-id-82' filepath='/usr/include/time.h' line='76' column='1' id='type-id-422'/>
     <!-- struct tm -->
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-424'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-423'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int tm::tm_sec -->
         <var-decl name='tm_sec' type-id='type-id-18' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
@@ -10110,137 +10092,137 @@ 
       </data-member>
     </class-decl>
     <!-- typedef _cpp_file _cpp_file -->
-    <typedef-decl name='_cpp_file' type-id='type-id-307' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-425'/>
+    <typedef-decl name='_cpp_file' type-id='type-id-306' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-424'/>
     <!-- _cpp_buff* -->
-    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-284'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-283'/>
     <!-- _cpp_buff** -->
-    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-425'/>
     <!-- _cpp_file* -->
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-289'/>
     <!-- _cpp_line_note* -->
-    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-357'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-356'/>
     <!-- _cpp_strbuf* -->
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-428'/>
+    <pointer-type-def type-id='type-id-426' size-in-bits='64' id='type-id-427'/>
     <!-- bool (cpp_reader*, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-331'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-330'/>
     <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-328'/>
     <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
     <!-- char* (const char*, cpp_dir*)* -->
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-339'/>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-364'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-338'/>
     <!-- const cpp_hashnode -->
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
+    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-307'/>
     <!-- const cpp_hashnode* -->
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-292'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-291'/>
     <!-- const cpp_macro -->
-    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-429'/>
+    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-428'/>
     <!-- const cpp_macro* -->
-    <pointer-type-def type-id='type-id-429' size-in-bits='64' id='type-id-430'/>
+    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-429'/>
     <!-- const cpp_string -->
-    <qualified-type-def type-id='type-id-273' const='yes' id='type-id-269'/>
+    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-268'/>
     <!-- const cpp_string* -->
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-261'/>
     <!-- const cpp_token -->
-    <qualified-type-def type-id='type-id-277' const='yes' id='type-id-270'/>
+    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-269'/>
     <!-- const cpp_token* -->
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-263'/>
     <!-- const cpp_token** -->
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-364'/>
     <!-- const directive -->
-    <qualified-type-def type-id='type-id-353' const='yes' id='type-id-309'/>
+    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
     <!-- const directive* -->
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-286'/>
     <!-- const time_t -->
-    <qualified-type-def type-id='type-id-423' const='yes' id='type-id-431'/>
+    <qualified-type-def type-id='type-id-422' const='yes' id='type-id-430'/>
     <!-- const time_t* -->
-    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-431'/>
     <!-- const tm -->
-    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-433'/>
+    <qualified-type-def type-id='type-id-423' const='yes' id='type-id-432'/>
     <!-- const tm* -->
-    <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-434'/>
+    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-433'/>
     <!-- const uchar -->
-    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-270'/>
     <!-- const uchar* -->
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-257'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-256'/>
     <!-- cpp_buffer* -->
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-281'/>
     <!-- cpp_comment* -->
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-361'/>
     <!-- cpp_context* -->
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
     <!-- cpp_dir* -->
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-288'/>
+    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-287'/>
     <!-- cpp_dir** -->
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-435'/>
+    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-434'/>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-327'/>
     <!-- cpp_reader* -->
-    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-259'/>
+    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-258'/>
     <!-- cpp_savedstate* -->
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-302'/>
     <!-- def_pragma_macro* -->
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-304'/>
     <!-- deps* -->
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-295'/>
     <!-- file_hash_entry_pool* -->
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-290'/>
     <!-- hash_table* -->
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-412'/>
     <!-- hashnode* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-359'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-358'/>
     <!-- ht* -->
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-298'/>
     <!-- ht_identifier* -->
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-357'/>
     <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-324'/>
     <!-- macro_context* -->
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-336'/>
     <!-- op* -->
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
     <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-296'/>
     <!-- time_t* -->
-    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-436'/>
+    <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-435'/>
     <!-- tm* -->
-    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-437'/>
+    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-436'/>
     <!-- tokenrun* -->
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-293'/>
     <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-359'/>
     <!-- uchar* -->
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-265'/>
     <!-- unsigned char* -->
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-280'/>
     <!-- void (cpp_reader*)* -->
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-329'/>
     <!-- void (cpp_reader*, const char*)* -->
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-319'/>
     <!-- void (cpp_reader*, const char*, int, const char*)* -->
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-325'/>
     <!-- void (cpp_reader*, const cpp_token*, int)* -->
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-317'/>
     <!-- void (cpp_reader*, const line_map*)* -->
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
     <!-- void (cpp_reader*, typedef source_location)* -->
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-324'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-323'/>
     <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-322'/>
     <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-320'/>
     <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
     <!-- int _cpp_warn_if_unused_macro(cpp_reader*, cpp_hashnode*, void*) -->
     <function-decl name='_cpp_warn_if_unused_macro' mangled-name='_cpp_warn_if_unused_macro' filepath='../.././libcpp/macro.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_warn_if_unused_macro'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116' name='node' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -10251,31 +10233,31 @@ 
     <!-- const uchar* _cpp_builtin_macro_text(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_builtin_macro_text' mangled-name='_cpp_builtin_macro_text' filepath='../.././libcpp/macro.c' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_builtin_macro_text'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116' name='node' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <!-- const uchar* -->
-      <return type-id='type-id-257'/>
+      <return type-id='type-id-256'/>
     </function-decl>
     <!-- uchar* cpp_quote_string(uchar*, const uchar*, unsigned int) -->
     <function-decl name='cpp_quote_string' mangled-name='_Z16cpp_quote_stringPhPKhj' filepath='../.././libcpp/macro.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_quote_stringPhPKhj'>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-266' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-265' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-257' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-256' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='len' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-266'/>
+      <return type-id='type-id-265'/>
     </function-decl>
     <!-- bool _cpp_arguments_ok(cpp_reader*, cpp_macro*, const cpp_hashnode*, unsigned int) -->
     <function-decl name='_cpp_arguments_ok' mangled-name='_cpp_arguments_ok' filepath='../.././libcpp/macro.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_arguments_ok'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'cpp_macro*' -->
       <parameter type-id='type-id-149' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'const cpp_hashnode*' -->
-      <parameter type-id='type-id-292' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-291' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='argc' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- bool -->
@@ -10284,11 +10266,11 @@ 
     <!-- void _cpp_push_token_context(cpp_reader*, cpp_hashnode*, const cpp_token*, unsigned int) -->
     <function-decl name='_cpp_push_token_context' mangled-name='_cpp_push_token_context' filepath='../.././libcpp/macro.c' line='1787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_token_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116' name='macro' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
+      <parameter type-id='type-id-263' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='count' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <!-- void -->
@@ -10297,11 +10279,11 @@ 
     <!-- void _cpp_push_text_context(cpp_reader*, cpp_hashnode*, const uchar*, size_t) -->
     <function-decl name='_cpp_push_text_context' mangled-name='_cpp_push_text_context' filepath='../.././libcpp/macro.c' line='1830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_text_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116' name='macro' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-257' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
+      <parameter type-id='type-id-256' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='len' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <!-- void -->
@@ -10310,21 +10292,21 @@ 
     <!-- void _cpp_pop_context(cpp_reader*) -->
     <function-decl name='_cpp_pop_context' mangled-name='_cpp_pop_context' filepath='../.././libcpp/macro.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- int cpp_sys_macro_p(cpp_reader*) -->
     <function-decl name='cpp_sys_macro_p' mangled-name='_Z15cpp_sys_macro_pP10cpp_reader' filepath='../.././libcpp/macro.c' line='2437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_sys_macro_pP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- void _cpp_backup_tokens_direct(cpp_reader*, unsigned int) -->
     <function-decl name='_cpp_backup_tokens_direct' mangled-name='_cpp_backup_tokens_direct' filepath='../.././libcpp/macro.c' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_backup_tokens_direct'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- void -->
@@ -10333,7 +10315,7 @@ 
     <!-- void _cpp_backup_tokens(cpp_reader*, unsigned int) -->
     <function-decl name='_cpp_backup_tokens' mangled-name='_Z18_cpp_backup_tokensP10cpp_readerj' filepath='../.././libcpp/macro.c' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18_cpp_backup_tokensP10cpp_readerj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- void -->
@@ -10342,23 +10324,23 @@ 
     <!-- const cpp_token* cpp_get_token_with_location(cpp_reader*, source_location*) -->
     <function-decl name='cpp_get_token_with_location' mangled-name='_Z27cpp_get_token_with_locationP10cpp_readerPj' filepath='../.././libcpp/macro.c' line='2424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_get_token_with_locationP10cpp_readerPj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <!-- parameter of type 'source_location*' -->
       <parameter type-id='type-id-117' name='loc' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-264'/>
+      <return type-id='type-id-263'/>
     </function-decl>
     <!-- const cpp_token* cpp_get_token(cpp_reader*) -->
     <function-decl name='cpp_get_token' mangled-name='_Z13cpp_get_tokenP10cpp_reader' filepath='../.././libcpp/macro.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_get_tokenP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-264'/>
+      <return type-id='type-id-263'/>
     </function-decl>
     <!-- void cpp_scan_nooutput(cpp_reader*) -->
     <function-decl name='cpp_scan_nooutput' mangled-name='_Z17cpp_scan_nooutputP10cpp_reader' filepath='../.././libcpp/macro.c' line='2447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_scan_nooutputP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -10372,7 +10354,7 @@ 
     <!-- bool _cpp_save_parameter(cpp_reader*, cpp_macro*, cpp_hashnode*) -->
     <function-decl name='_cpp_save_parameter' mangled-name='_cpp_save_parameter' filepath='../.././libcpp/macro.c' line='2590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_parameter'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- parameter of type 'cpp_macro*' -->
       <parameter type-id='type-id-149' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
@@ -10383,7 +10365,7 @@ 
     <!-- bool _cpp_create_definition(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_create_definition' mangled-name='_cpp_create_definition' filepath='../.././libcpp/macro.c' line='2938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_definition'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116'/>
       <!-- bool -->
@@ -10392,7 +10374,7 @@ 
     <!-- const unsigned char* cpp_macro_definition(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='cpp_macro_definition' mangled-name='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode' filepath='../.././libcpp/macro.c' line='3080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- const unsigned char* -->
@@ -10405,16 +10387,16 @@ 
     <!-- cpp_token* _cpp_temp_token(cpp_reader*) -->
     <function-decl name='_cpp_temp_token' mangled-name='_cpp_temp_token' filepath='../.././libcpp/internal.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_temp_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- cpp_token* -->
       <return type-id='type-id-164'/>
     </function-decl>
     <!-- void _cpp_extend_buff(cpp_reader*, _cpp_buff**, size_t) -->
     <function-decl name='_cpp_extend_buff' mangled-name='_cpp_extend_buff' filepath='../.././libcpp/internal.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_extend_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type '_cpp_buff**' -->
-      <parameter type-id='type-id-426'/>
+      <parameter type-id='type-id-425'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- void -->
@@ -10423,147 +10405,147 @@ 
     <!-- cpp_token* _cpp_lex_direct(cpp_reader*) -->
     <function-decl name='_cpp_lex_direct' mangled-name='_cpp_lex_direct' filepath='../.././libcpp/internal.h' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_direct'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- cpp_token* -->
       <return type-id='type-id-164'/>
     </function-decl>
     <!-- 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-436'/>
+      <parameter type-id='type-id-435'/>
       <!-- typedef time_t -->
-      <return type-id='type-id-423'/>
+      <return type-id='type-id-422'/>
     </function-decl>
     <!-- tm* localtime(const time_t*) -->
     <function-decl name='localtime' filepath='/usr/include/time.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const time_t*' -->
-      <parameter type-id='type-id-432'/>
+      <parameter type-id='type-id-431'/>
       <!-- tm* -->
-      <return type-id='type-id-437'/>
+      <return type-id='type-id-436'/>
     </function-decl>
     <!-- unsigned char* _cpp_unaligned_alloc(cpp_reader*, size_t) -->
     <function-decl name='_cpp_unaligned_alloc' mangled-name='_cpp_unaligned_alloc' filepath='../.././libcpp/internal.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_unaligned_alloc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-281'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- const char* _cpp_get_file_name(_cpp_file*) -->
     <function-decl name='_cpp_get_file_name' mangled-name='_cpp_get_file_name' filepath='../.././libcpp/internal.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_name'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-290'/>
+      <parameter type-id='type-id-289'/>
       <!-- const char* -->
       <return type-id='type-id-15'/>
     </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'>
       <!-- parameter of type 'const tm*' -->
-      <parameter type-id='type-id-434'/>
+      <parameter type-id='type-id-433'/>
       <!-- char* -->
       <return type-id='type-id-51'/>
     </function-decl>
     <!-- stat* _cpp_get_file_stat(_cpp_file*) -->
     <function-decl name='_cpp_get_file_stat' mangled-name='_cpp_get_file_stat' filepath='../.././libcpp/internal.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_stat'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-290'/>
+      <parameter type-id='type-id-289'/>
       <!-- stat* -->
       <return type-id='type-id-132'/>
     </function-decl>
     <!-- void _cpp_clean_line(cpp_reader*) -->
     <function-decl name='_cpp_clean_line' mangled-name='_cpp_clean_line' filepath='../.././libcpp/internal.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_clean_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void _cpp_pop_buffer(cpp_reader*) -->
     <function-decl name='_cpp_pop_buffer' mangled-name='_cpp_pop_buffer' filepath='../.././libcpp/internal.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- int _cpp_do__Pragma(cpp_reader*) -->
     <function-decl name='_cpp_do__Pragma' mangled-name='_cpp_do__Pragma' filepath='../.././libcpp/internal.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do__Pragma'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- void _cpp_free_buff(_cpp_buff*) -->
     <function-decl name='_cpp_free_buff' mangled-name='_cpp_free_buff' filepath='../.././libcpp/internal.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_free_buff'>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-283'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- _cpp_buff* _cpp_get_buff(cpp_reader*, size_t) -->
     <function-decl name='_cpp_get_buff' mangled-name='_cpp_get_buff' filepath='../.././libcpp/internal.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- _cpp_buff* -->
-      <return type-id='type-id-284'/>
+      <return type-id='type-id-283'/>
     </function-decl>
     <!-- _cpp_buff* _cpp_append_extend_buff(cpp_reader*, _cpp_buff*, size_t) -->
     <function-decl name='_cpp_append_extend_buff' mangled-name='_cpp_append_extend_buff' filepath='../.././libcpp/internal.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_append_extend_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-283'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- _cpp_buff* -->
-      <return type-id='type-id-284'/>
+      <return type-id='type-id-283'/>
     </function-decl>
     <!-- void _cpp_release_buff(cpp_reader*, _cpp_buff*) -->
     <function-decl name='_cpp_release_buff' mangled-name='_cpp_release_buff' filepath='../.././libcpp/internal.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_release_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-283'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- const cpp_token* _cpp_lex_token(cpp_reader*) -->
     <function-decl name='_cpp_lex_token' mangled-name='_cpp_lex_token' filepath='../.././libcpp/internal.h' line='651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-264'/>
+      <return type-id='type-id-263'/>
     </function-decl>
     <!-- bool _cpp_read_logical_line_trad(cpp_reader*) -->
     <function-decl name='_cpp_read_logical_line_trad' mangled-name='_cpp_read_logical_line_trad' filepath='../.././libcpp/internal.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_logical_line_trad'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int _cpp_equiv_tokens(const cpp_token*, const cpp_token*) -->
     <function-decl name='_cpp_equiv_tokens' mangled-name='_cpp_equiv_tokens' filepath='../.././libcpp/internal.h' line='653' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_equiv_tokens'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264'/>
+      <parameter type-id='type-id-263'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264'/>
+      <parameter type-id='type-id-263'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- bool _cpp_expansions_different_trad(const cpp_macro*, const cpp_macro*) -->
     <function-decl name='_cpp_expansions_different_trad' mangled-name='_cpp_expansions_different_trad' filepath='../.././libcpp/internal.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expansions_different_trad'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-430'/>
+      <parameter type-id='type-id-429'/>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-430'/>
+      <parameter type-id='type-id-429'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- bool _cpp_create_trad_definition(cpp_reader*, cpp_macro*) -->
     <function-decl name='_cpp_create_trad_definition' mangled-name='_cpp_create_trad_definition' filepath='../.././libcpp/internal.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_trad_definition'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'cpp_macro*' -->
       <parameter type-id='type-id-149'/>
       <!-- bool -->
@@ -10572,41 +10554,41 @@ 
     <!-- unsigned char* _cpp_aligned_alloc(cpp_reader*, size_t) -->
     <function-decl name='_cpp_aligned_alloc' mangled-name='_cpp_aligned_alloc' filepath='../.././libcpp/internal.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_aligned_alloc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-281'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- size_t _cpp_replacement_text_len(const cpp_macro*) -->
     <function-decl name='_cpp_replacement_text_len' mangled-name='_cpp_replacement_text_len' filepath='../.././libcpp/internal.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_replacement_text_len'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-430'/>
+      <parameter type-id='type-id-429'/>
       <!-- typedef size_t -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- unsigned char* _cpp_copy_replacement_text(const cpp_macro*, unsigned char*) -->
     <function-decl name='_cpp_copy_replacement_text' filepath='../.././libcpp/internal.h' line='696' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-430'/>
+      <parameter type-id='type-id-429'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-281'/>
+      <parameter type-id='type-id-280'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-281'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- bool (cpp_reader*, cpp_hashnode*) -->
-    <function-type size-in-bits='64' id='type-id-349'>
+    <function-type size-in-bits='64' id='type-id-348'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- bool (cpp_reader*, int, int, source_location, unsigned int, const char*, va_list*) -->
-    <function-type size-in-bits='64' id='type-id-350'>
+    <function-type size-in-bits='64' id='type-id-349'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'int' -->
@@ -10623,51 +10605,51 @@ 
       <return type-id='type-id-1'/>
     </function-type>
     <!-- bool (iconv_t, const unsigned char*, size_t, _cpp_strbuf*) -->
-    <function-type size-in-bits='64' id='type-id-376'>
+    <function-type size-in-bits='64' id='type-id-375'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-209'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type '_cpp_strbuf*' -->
-      <parameter type-id='type-id-428'/>
+      <parameter type-id='type-id-427'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- char* (const char*, cpp_dir*) -->
-    <function-type size-in-bits='64' id='type-id-351'>
+    <function-type size-in-bits='64' id='type-id-350'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-288'/>
+      <parameter type-id='type-id-287'/>
       <!-- char* -->
       <return type-id='type-id-51'/>
     </function-type>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**) -->
-    <function-type size-in-bits='64' id='type-id-377'>
+    <function-type size-in-bits='64' id='type-id-376'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'cpp_dir**' -->
-      <parameter type-id='type-id-435'/>
+      <parameter type-id='type-id-434'/>
       <!-- const char* -->
       <return type-id='type-id-15'/>
     </function-type>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*) -->
-    <function-type size-in-bits='64' id='type-id-354'>
+    <function-type size-in-bits='64' id='type-id-353'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264'/>
+      <parameter type-id='type-id-263'/>
       <!-- cpp_hashnode* -->
       <return type-id='type-id-116'/>
     </function-type>
     <!-- int (cpp_reader*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-355'>
+    <function-type size-in-bits='64' id='type-id-354'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'int' -->
@@ -10676,32 +10658,32 @@ 
       <return type-id='type-id-18'/>
     </function-type>
     <!-- hashnode (hash_table*) -->
-    <function-type size-in-bits='64' id='type-id-382'>
+    <function-type size-in-bits='64' id='type-id-381'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-412'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-379'/>
+      <return type-id='type-id-378'/>
     </function-type>
     <!-- void (cpp_reader*) -->
-    <function-type size-in-bits='64' id='type-id-366'>
+    <function-type size-in-bits='64' id='type-id-365'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void (cpp_reader*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-367'>
+    <function-type size-in-bits='64' id='type-id-366'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void (cpp_reader*, const char*, int, const char*) -->
-    <function-type size-in-bits='64' id='type-id-368'>
+    <function-type size-in-bits='64' id='type-id-367'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'int' -->
@@ -10712,49 +10694,49 @@ 
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void (cpp_reader*, const cpp_token*, int) -->
-    <function-type size-in-bits='64' id='type-id-369'>
+    <function-type size-in-bits='64' id='type-id-368'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-264'/>
+      <parameter type-id='type-id-263'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void (cpp_reader*, const line_map*) -->
-    <function-type size-in-bits='64' id='type-id-370'>
+    <function-type size-in-bits='64' id='type-id-369'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const line_map*' -->
       <parameter type-id='type-id-48'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void (cpp_reader*, source_location) -->
-    <function-type size-in-bits='64' id='type-id-371'>
+    <function-type size-in-bits='64' id='type-id-370'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, const cpp_string*) -->
-    <function-type size-in-bits='64' id='type-id-372'>
+    <function-type size-in-bits='64' id='type-id-371'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-262'/>
+      <parameter type-id='type-id-261'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, const unsigned char*, const char*, int, const cpp_token**) -->
-    <function-type size-in-bits='64' id='type-id-373'>
+    <function-type size-in-bits='64' id='type-id-372'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- parameter of type 'const unsigned char*' -->
@@ -10764,14 +10746,14 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const cpp_token**' -->
-      <parameter type-id='type-id-365'/>
+      <parameter type-id='type-id-364'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, cpp_hashnode*) -->
-    <function-type size-in-bits='64' id='type-id-374'>
+    <function-type size-in-bits='64' id='type-id-373'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-103'/>
       <!-- parameter of type 'cpp_hashnode*' -->
@@ -10780,29 +10762,29 @@ 
       <return type-id='type-id-31'/>
     </function-type>
     <!-- struct _cpp_strbuf -->
-    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-427'/>
+    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- const deps -->
-    <qualified-type-def type-id='type-id-313' const='yes' id='type-id-438'/>
+    <qualified-type-def type-id='type-id-312' const='yes' id='type-id-437'/>
     <!-- const deps* -->
-    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-439'/>
+    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-438'/>
     <!-- deps* deps_init() -->
     <function-decl name='deps_init' mangled-name='_Z9deps_initv' filepath='../.././libcpp/mkdeps.c' line='168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_initv'>
       <!-- deps* -->
-      <return type-id='type-id-296'/>
+      <return type-id='type-id-295'/>
     </function-decl>
     <!-- void deps_free(deps*) -->
     <function-decl name='deps_free' mangled-name='_Z9deps_freeP4deps' filepath='../.././libcpp/mkdeps.c' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_freeP4deps'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-296' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
+      <parameter type-id='type-id-295' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void deps_add_target(deps*, const char*, int) -->
     <function-decl name='deps_add_target' mangled-name='_Z15deps_add_targetP4depsPKci' filepath='../.././libcpp/mkdeps.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15deps_add_targetP4depsPKci'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-296' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
+      <parameter type-id='type-id-295' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='t' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <!-- parameter of type 'int' -->
@@ -10813,7 +10795,7 @@ 
     <!-- void deps_add_default_target(deps*, const char*) -->
     <function-decl name='deps_add_default_target' mangled-name='_Z23deps_add_default_targetP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23deps_add_default_targetP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-296'/>
+      <parameter type-id='type-id-295'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -10822,7 +10804,7 @@ 
     <!-- void deps_add_dep(deps*, const char*) -->
     <function-decl name='deps_add_dep' mangled-name='_Z12deps_add_depP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_add_depP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-296'/>
+      <parameter type-id='type-id-295'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -10831,7 +10813,7 @@ 
     <!-- void deps_add_vpath(deps*, const char*) -->
     <function-decl name='deps_add_vpath' mangled-name='_Z14deps_add_vpathP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14deps_add_vpathP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-296'/>
+      <parameter type-id='type-id-295'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- void -->
@@ -10840,7 +10822,7 @@ 
     <!-- void deps_write(const deps*, FILE*, unsigned int) -->
     <function-decl name='deps_write' mangled-name='_Z10deps_writePK4depsP8_IO_FILEj' filepath='../.././libcpp/mkdeps.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10deps_writePK4depsP8_IO_FILEj'>
       <!-- parameter of type 'const deps*' -->
-      <parameter type-id='type-id-439' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
+      <parameter type-id='type-id-438' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='fp' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -10851,7 +10833,7 @@ 
     <!-- void deps_phony_targets(const deps*, FILE*) -->
     <function-decl name='deps_phony_targets' mangled-name='_Z18deps_phony_targetsPK4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18deps_phony_targetsPK4depsP8_IO_FILE'>
       <!-- parameter of type 'const deps*' -->
-      <parameter type-id='type-id-439' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
+      <parameter type-id='type-id-438' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='fp' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <!-- void -->
@@ -10860,7 +10842,7 @@ 
     <!-- int deps_save(deps*, FILE*) -->
     <function-decl name='deps_save' mangled-name='_Z9deps_saveP4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_saveP4depsP8_IO_FILE'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-296' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
+      <parameter type-id='type-id-295' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='f' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <!-- int -->
@@ -10869,7 +10851,7 @@ 
     <!-- int deps_restore(deps*, FILE*, const char*) -->
     <function-decl name='deps_restore' mangled-name='_Z12deps_restoreP4depsP8_IO_FILEPKc' filepath='../.././libcpp/mkdeps.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_restoreP4depsP8_IO_FILEPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-296' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
+      <parameter type-id='type-id-295' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-89' name='fd' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -10884,19 +10866,19 @@ 
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13'/>
       <!-- hash_table* -->
-      <return type-id='type-id-413'/>
+      <return type-id='type-id-412'/>
     </function-decl>
     <!-- void ht_destroy(hash_table*) -->
     <function-decl name='ht_destroy' mangled-name='_Z10ht_destroyP2ht' filepath='../.././libcpp/symtab.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10ht_destroyP2ht'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-412'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- hashnode ht_lookup_with_hash(hash_table*, const unsigned char*, size_t, unsigned int, ht_lookup_option) -->
     <function-decl name='ht_lookup_with_hash' mangled-name='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option' filepath='../.././libcpp/symtab.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-412'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -10904,29 +10886,29 @@ 
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13'/>
       <!-- parameter of type 'enum ht_lookup_option' -->
-      <parameter type-id='type-id-440'/>
+      <parameter type-id='type-id-439'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-379'/>
+      <return type-id='type-id-378'/>
     </function-decl>
     <!-- hashnode ht_lookup(hash_table*, const unsigned char*, size_t, ht_lookup_option) -->
     <function-decl name='ht_lookup' mangled-name='_Z9ht_lookupP2htPKhm16ht_lookup_option' filepath='../.././libcpp/symtab.c' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_lookupP2htPKhm16ht_lookup_option'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-412'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- parameter of type 'enum ht_lookup_option' -->
-      <parameter type-id='type-id-440'/>
+      <parameter type-id='type-id-439'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-379'/>
+      <return type-id='type-id-378'/>
     </function-decl>
     <!-- void ht_forall(hash_table*, ht_cb, void*) -->
     <function-decl name='ht_forall' mangled-name='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/symtab.c' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-412'/>
       <!-- parameter of type 'typedef ht_cb' -->
-      <parameter type-id='type-id-411'/>
+      <parameter type-id='type-id-410'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- void -->
@@ -10935,9 +10917,9 @@ 
     <!-- void ht_purge(hash_table*, ht_cb, void*) -->
     <function-decl name='ht_purge' mangled-name='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/symtab.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-412'/>
       <!-- parameter of type 'typedef ht_cb' -->
-      <parameter type-id='type-id-411'/>
+      <parameter type-id='type-id-410'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14'/>
       <!-- void -->
@@ -10946,9 +10928,9 @@ 
     <!-- void ht_load(hash_table*, hashnode*, unsigned int, unsigned int, bool) -->
     <function-decl name='ht_load' mangled-name='_Z7ht_loadP2htPP13ht_identifierjjb' filepath='../.././libcpp/symtab.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z7ht_loadP2htPP13ht_identifierjjb'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-412' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'hashnode*' -->
-      <parameter type-id='type-id-359' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-358' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='nslots' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -10961,7 +10943,7 @@ 
     <!-- void ht_dump_statistics(hash_table*) -->
     <function-decl name='ht_dump_statistics' mangled-name='_Z18ht_dump_statisticsP2ht' filepath='../.././libcpp/symtab.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18ht_dump_statisticsP2ht'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-412'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -10973,7 +10955,7 @@ 
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- enum ht_lookup_option -->
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-440'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-439'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
@@ -10981,7 +10963,7 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/traditional.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- enum ht_lookup_option -->
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-440'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-439'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
@@ -10989,9 +10971,9 @@ 
     <!-- void _cpp_overlay_buffer(cpp_reader*, const uchar*, size_t) -->
     <function-decl name='_cpp_overlay_buffer' mangled-name='_cpp_overlay_buffer' filepath='../.././libcpp/traditional.c' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_overlay_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-257' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-256' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='len' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- void -->
@@ -11000,14 +10982,14 @@ 
     <!-- void _cpp_remove_overlay(cpp_reader*) -->
     <function-decl name='_cpp_remove_overlay' mangled-name='_cpp_remove_overlay' filepath='../.././libcpp/traditional.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remove_overlay'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- bool _cpp_scan_out_logical_line(cpp_reader*, cpp_macro*) -->
     <function-decl name='_cpp_scan_out_logical_line' mangled-name='_cpp_scan_out_logical_line' filepath='../.././libcpp/traditional.c' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_scan_out_logical_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'cpp_macro*' -->
       <parameter type-id='type-id-149'/>
       <!-- bool -->
@@ -11016,16 +10998,16 @@ 
     <!-- uchar* _cpp_copy_replacement_text(const cpp_macro*, uchar*) -->
     <function-decl name='_cpp_copy_replacement_text' mangled-name='_cpp_copy_replacement_text' filepath='../.././libcpp/traditional.c' line='790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_copy_replacement_text'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-430' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-429' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-266' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-265' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-266'/>
+      <return type-id='type-id-265'/>
     </function-decl>
     <!-- void _cpp_push_text_context(cpp_reader*, cpp_hashnode*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_push_text_context' filepath='../.././libcpp/internal.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116'/>
       <!-- parameter of type 'const unsigned char*' -->
@@ -11038,7 +11020,7 @@ 
     <!-- const unsigned char* _cpp_builtin_macro_text(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_builtin_macro_text' filepath='../.././libcpp/internal.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-116' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- const unsigned char* -->
@@ -11047,14 +11029,14 @@ 
     <!-- bool _cpp_skip_block_comment(cpp_reader*) -->
     <function-decl name='_cpp_skip_block_comment' mangled-name='_cpp_skip_block_comment' filepath='../.././libcpp/internal.h' line='649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_skip_block_comment'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int _cpp_handle_directive(cpp_reader*, int) -->
     <function-decl name='_cpp_handle_directive' mangled-name='_cpp_handle_directive' filepath='../.././libcpp/internal.h' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_handle_directive'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- int -->
@@ -11063,7 +11045,7 @@ 
     <!-- void _cpp_process_line_notes(cpp_reader*, int) -->
     <function-decl name='_cpp_process_line_notes' mangled-name='_cpp_process_line_notes' filepath='../.././libcpp/internal.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_process_line_notes'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- void -->
@@ -11072,7 +11054,7 @@ 
     <!-- bool _cpp_get_fresh_line(cpp_reader*) -->
     <function-decl name='_cpp_get_fresh_line' mangled-name='_cpp_get_fresh_line' filepath='../.././libcpp/internal.h' line='648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_fresh_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -11190,40 +11172,40 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const demangle_builtin_type_info[33] -->
-    <array-type-def dimensions='1' type-id='type-id-441' size-in-bits='8448' id='type-id-442'>
+    <array-type-def dimensions='1' type-id='type-id-440' size-in-bits='8448' id='type-id-441'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-4' id='type-id-443'/>
+      <subrange length='33' type-id='type-id-4' id='type-id-442'/>
     </array-type-def>
     <!-- const demangle_operator_info[58] -->
-    <array-type-def dimensions='1' type-id='type-id-444' size-in-bits='11136' id='type-id-445'>
+    <array-type-def dimensions='1' type-id='type-id-443' size-in-bits='11136' id='type-id-444'>
       <!-- <anonymous range>[58] -->
-      <subrange length='58' type-id='type-id-4' id='type-id-446'/>
+      <subrange length='58' type-id='type-id-4' id='type-id-445'/>
     </array-type-def>
     <!-- demangle_builtin_type_info[33] -->
-    <array-type-def dimensions='1' type-id='type-id-447' size-in-bits='8448' id='type-id-448'>
+    <array-type-def dimensions='1' type-id='type-id-446' size-in-bits='8448' id='type-id-447'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-4' id='type-id-443'/>
+      <subrange length='33' type-id='type-id-4' id='type-id-442'/>
     </array-type-def>
     <!-- demangle_operator_info[58] -->
-    <array-type-def dimensions='1' type-id='type-id-449' size-in-bits='11136' id='type-id-450'>
+    <array-type-def dimensions='1' type-id='type-id-448' size-in-bits='11136' id='type-id-449'>
       <!-- <anonymous range>[58] -->
-      <subrange length='58' type-id='type-id-4' id='type-id-446'/>
+      <subrange length='58' type-id='type-id-4' id='type-id-445'/>
     </array-type-def>
     <!-- short int -->
-    <type-decl name='short int' size-in-bits='16' id='type-id-451'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-450'/>
     <!-- struct demangle_component -->
-    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-452'>
+    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-451'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component_type demangle_component::type -->
-        <var-decl name='type' type-id='type-id-453' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
+        <var-decl name='type' type-id='type-id-452' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} demangle_component::u -->
-        <var-decl name='u' type-id='type-id-454' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
+        <var-decl name='u' type-id='type-id-453' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum demangle_component_type -->
-    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-453'>
+    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-452'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='DEMANGLE_COMPONENT_NAME' value='0'/>
       <enumerator name='DEMANGLE_COMPONENT_QUAL_NAME' value='1'/>
@@ -11298,58 +11280,58 @@ 
       <enumerator name='DEMANGLE_COMPONENT_CLONE' value='70'/>
     </enum-decl>
     <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} -->
-    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-454'>
+    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-453'>
       <data-member access='private'>
         <!-- struct {const char* s; int len;} s_name -->
-        <var-decl name='s_name' type-id='type-id-455' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
+        <var-decl name='s_name' type-id='type-id-454' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const demangle_operator_info* op;} s_operator -->
-        <var-decl name='s_operator' type-id='type-id-456' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
+        <var-decl name='s_operator' type-id='type-id-455' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {int args; demangle_component* name;} s_extended_operator -->
-        <var-decl name='s_extended_operator' type-id='type-id-457' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
+        <var-decl name='s_extended_operator' type-id='type-id-456' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* length; short int accum; short int sat;} s_fixed -->
-        <var-decl name='s_fixed' type-id='type-id-458' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
+        <var-decl name='s_fixed' type-id='type-id-457' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor -->
-        <var-decl name='s_ctor' type-id='type-id-459' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
+        <var-decl name='s_ctor' type-id='type-id-458' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor -->
-        <var-decl name='s_dtor' type-id='type-id-460' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
+        <var-decl name='s_dtor' type-id='type-id-459' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const demangle_builtin_type_info* type;} s_builtin -->
-        <var-decl name='s_builtin' type-id='type-id-461' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
+        <var-decl name='s_builtin' type-id='type-id-460' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const char* string; int len;} s_string -->
-        <var-decl name='s_string' type-id='type-id-462' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
+        <var-decl name='s_string' type-id='type-id-461' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {long int number;} s_number -->
-        <var-decl name='s_number' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
+        <var-decl name='s_number' type-id='type-id-462' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {int character;} s_character -->
-        <var-decl name='s_character' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
+        <var-decl name='s_character' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* left; demangle_component* right;} s_binary -->
-        <var-decl name='s_binary' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
+        <var-decl name='s_binary' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* sub; int num;} s_unary_num -->
-        <var-decl name='s_unary_num' type-id='type-id-466' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
+        <var-decl name='s_unary_num' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
       </data-member>
     </union-decl>
     <!-- struct {const char* s; int len;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-455'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-454'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* s -->
         <var-decl name='s' type-id='type-id-15' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='446' column='1'/>
@@ -11360,14 +11342,14 @@ 
       </data-member>
     </class-decl>
     <!-- struct {const demangle_operator_info* op;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-456'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-455'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const demangle_operator_info* op -->
-        <var-decl name='op' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
+        <var-decl name='op' type-id='type-id-466' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct demangle_operator_info -->
-    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-449'>
+    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-448'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* demangle_operator_info::code -->
         <var-decl name='code' type-id='type-id-15' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='40' column='1'/>
@@ -11386,44 +11368,44 @@ 
       </data-member>
     </class-decl>
     <!-- struct {int args; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-457'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-456'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int args -->
         <var-decl name='args' type-id='type-id-18' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
+        <var-decl name='name' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* length; short int accum; short int sat;} -->
-    <class-decl name='__anonymous_struct__3' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-458'>
+    <class-decl name='__anonymous_struct__3' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-457'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* length -->
-        <var-decl name='length' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
+        <var-decl name='length' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- short int accum -->
-        <var-decl name='accum' type-id='type-id-451' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
+        <var-decl name='accum' type-id='type-id-450' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
         <!-- short int sat -->
-        <var-decl name='sat' type-id='type-id-451' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
+        <var-decl name='sat' type-id='type-id-450' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__4' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-459'>
+    <class-decl name='__anonymous_struct__4' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-458'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- gnu_v3_ctor_kinds kind -->
-        <var-decl name='kind' type-id='type-id-469' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
+        <var-decl name='kind' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
+        <var-decl name='name' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum gnu_v3_ctor_kinds -->
-    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-469'>
+    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-468'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='gnu_v3_complete_object_ctor' value='1'/>
       <enumerator name='gnu_v3_base_object_ctor' value='2'/>
@@ -11431,18 +11413,18 @@ 
       <enumerator name='gnu_v3_object_ctor_group' value='4'/>
     </enum-decl>
     <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-460'>
+    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-459'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- gnu_v3_dtor_kinds kind -->
-        <var-decl name='kind' type-id='type-id-470' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
+        <var-decl name='kind' type-id='type-id-469' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
+        <var-decl name='name' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum gnu_v3_dtor_kinds -->
-    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-470'>
+    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-469'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='gnu_v3_deleting_dtor' value='1'/>
       <enumerator name='gnu_v3_complete_object_dtor' value='2'/>
@@ -11450,14 +11432,14 @@ 
       <enumerator name='gnu_v3_object_dtor_group' value='4'/>
     </enum-decl>
     <!-- struct {const demangle_builtin_type_info* type;} -->
-    <class-decl name='__anonymous_struct__6' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-461'>
+    <class-decl name='__anonymous_struct__6' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-460'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const demangle_builtin_type_info* type -->
-        <var-decl name='type' type-id='type-id-471' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
+        <var-decl name='type' type-id='type-id-470' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct demangle_builtin_type_info -->
-    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-447'>
+    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-446'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* demangle_builtin_type_info::name -->
         <var-decl name='name' type-id='type-id-15' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='80' column='1'/>
@@ -11476,11 +11458,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- d_builtin_type_print demangle_builtin_type_info::print -->
-        <var-decl name='print' type-id='type-id-472' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
+        <var-decl name='print' type-id='type-id-471' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum d_builtin_type_print -->
-    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-472'>
+    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-471'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='D_PRINT_DEFAULT' value='0'/>
       <enumerator name='D_PRINT_INT' value='1'/>
@@ -11494,7 +11476,7 @@ 
       <enumerator name='D_PRINT_VOID' value='9'/>
     </enum-decl>
     <!-- struct {const char* string; int len;} -->
-    <class-decl name='__anonymous_struct__7' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-462'>
+    <class-decl name='__anonymous_struct__7' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-461'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* string -->
         <var-decl name='string' type-id='type-id-15' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='506' column='1'/>
@@ -11505,35 +11487,35 @@ 
       </data-member>
     </class-decl>
     <!-- struct {long int number;} -->
-    <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-463'>
+    <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-462'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int number -->
         <var-decl name='number' type-id='type-id-21' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='515' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {int character;} -->
-    <class-decl name='__anonymous_struct__9' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-464'>
+    <class-decl name='__anonymous_struct__9' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-463'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int character -->
         <var-decl name='character' type-id='type-id-18' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='521' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* left; demangle_component* right;} -->
-    <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-465'>
+    <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-464'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* left -->
-        <var-decl name='left' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
+        <var-decl name='left' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* right -->
-        <var-decl name='right' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
+        <var-decl name='right' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* sub; int num;} -->
-    <class-decl name='__anonymous_struct__11' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-466'>
+    <class-decl name='__anonymous_struct__11' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-465'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* sub -->
-        <var-decl name='sub' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
+        <var-decl name='sub' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int num -->
@@ -11541,7 +11523,7 @@ 
       </data-member>
     </class-decl>
     <!-- struct d_info -->
-    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-473'>
+    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-472'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* d_info::s -->
         <var-decl name='s' type-id='type-id-15' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='96' column='1'/>
@@ -11560,7 +11542,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- demangle_component* d_info::comps -->
-        <var-decl name='comps' type-id='type-id-468' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
+        <var-decl name='comps' type-id='type-id-467' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int d_info::next_comp -->
@@ -11572,7 +11554,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- demangle_component** d_info::subs -->
-        <var-decl name='subs' type-id='type-id-474' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
+        <var-decl name='subs' type-id='type-id-473' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int d_info::next_sub -->
@@ -11588,7 +11570,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- demangle_component* d_info::last_name -->
-        <var-decl name='last_name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
+        <var-decl name='last_name' type-id='type-id-467' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- int d_info::expansion -->
@@ -11596,31 +11578,31 @@ 
       </data-member>
     </class-decl>
     <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
-    <typedef-decl name='demangle_callbackref' type-id='type-id-475' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-476'/>
+    <typedef-decl name='demangle_callbackref' type-id='type-id-474' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-475'/>
     <!-- const demangle_builtin_type_info -->
-    <qualified-type-def type-id='type-id-447' const='yes' id='type-id-441'/>
+    <qualified-type-def type-id='type-id-446' const='yes' id='type-id-440'/>
     <!-- const demangle_builtin_type_info* -->
-    <pointer-type-def type-id='type-id-441' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-470'/>
     <!-- const demangle_component -->
-    <qualified-type-def type-id='type-id-452' const='yes' id='type-id-477'/>
+    <qualified-type-def type-id='type-id-451' const='yes' id='type-id-476'/>
     <!-- const demangle_component* -->
-    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-476' size-in-bits='64' id='type-id-477'/>
     <!-- const demangle_operator_info -->
-    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-444'/>
+    <qualified-type-def type-id='type-id-448' const='yes' id='type-id-443'/>
     <!-- const demangle_operator_info* -->
-    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-443' size-in-bits='64' id='type-id-466'/>
     <!-- d_info* -->
-    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-478'/>
     <!-- demangle_component* -->
-    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-467'/>
     <!-- demangle_component** -->
-    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-473'/>
     <!-- void (const char*, typedef size_t, void*)* -->
-    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-475'/>
+    <pointer-type-def type-id='type-id-479' size-in-bits='64' id='type-id-474'/>
     <!-- int cplus_demangle_fill_name(demangle_component*, const char*, int) -->
     <function-decl name='cplus_demangle_fill_name' mangled-name='cplus_demangle_fill_name' filepath='../.././libiberty/cp-demangle.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_name'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
+      <parameter type-id='type-id-467' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='s' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <!-- parameter of type 'int' -->
@@ -11631,60 +11613,60 @@ 
     <!-- int cplus_demangle_fill_extended_operator(demangle_component*, int, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_extended_operator' mangled-name='cplus_demangle_fill_extended_operator' filepath='../.././libiberty/cp-demangle.c' line='725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_extended_operator'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
+      <parameter type-id='type-id-467' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='args' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
+      <parameter type-id='type-id-467' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- int cplus_demangle_fill_ctor(demangle_component*, gnu_v3_ctor_kinds, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_ctor' mangled-name='cplus_demangle_fill_ctor' filepath='../.././libiberty/cp-demangle.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_ctor'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
+      <parameter type-id='type-id-467' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
       <!-- parameter of type 'enum gnu_v3_ctor_kinds' -->
-      <parameter type-id='type-id-469' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
+      <parameter type-id='type-id-468' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
+      <parameter type-id='type-id-467' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- int cplus_demangle_fill_dtor(demangle_component*, gnu_v3_dtor_kinds, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_dtor' mangled-name='cplus_demangle_fill_dtor' filepath='../.././libiberty/cp-demangle.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_dtor'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
+      <parameter type-id='type-id-467' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
       <!-- parameter of type 'enum gnu_v3_dtor_kinds' -->
-      <parameter type-id='type-id-470' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
+      <parameter type-id='type-id-469' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
+      <parameter type-id='type-id-467' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- demangle_component* cplus_demangle_type(d_info*) -->
     <function-decl name='cplus_demangle_type' mangled-name='cplus_demangle_type' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_type'>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
+      <parameter type-id='type-id-478' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
       <!-- demangle_component* -->
-      <return type-id='type-id-468'/>
+      <return type-id='type-id-467'/>
     </function-decl>
     <!-- demangle_component* cplus_demangle_mangled_name(d_info*, int) -->
     <function-decl name='cplus_demangle_mangled_name' mangled-name='cplus_demangle_mangled_name' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_mangled_name'>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
+      <parameter type-id='type-id-478' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='top_level' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <!-- demangle_component* -->
-      <return type-id='type-id-468'/>
+      <return type-id='type-id-467'/>
     </function-decl>
     <!-- int cplus_demangle_print_callback(int, const demangle_component*, demangle_callbackref, void*) -->
     <function-decl name='cplus_demangle_print_callback' mangled-name='cplus_demangle_print_callback' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_print_callback'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='options' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1'/>
       <!-- parameter of type 'const demangle_component*' -->
-      <parameter type-id='type-id-478' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
+      <parameter type-id='type-id-477' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
+      <parameter type-id='type-id-475' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <!-- int -->
@@ -11695,11 +11677,11 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='options' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <!-- parameter of type 'const demangle_component*' -->
-      <parameter type-id='type-id-478' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
+      <parameter type-id='type-id-477' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='estimate' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-212' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
+      <parameter type-id='type-id-211' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <!-- char* -->
       <return type-id='type-id-51'/>
     </function-decl>
@@ -11712,7 +11694,7 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='len' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
+      <parameter type-id='type-id-478' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -11723,7 +11705,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18' name='options' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
+      <parameter type-id='type-id-475' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <!-- int -->
@@ -11734,7 +11716,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5443' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
+      <parameter type-id='type-id-475' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <!-- int -->
@@ -11745,19 +11727,19 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='name' filepath='../.././libiberty/cp-demangle.c' line='5530' column='1'/>
       <!-- enum gnu_v3_ctor_kinds -->
-      <return type-id='type-id-469'/>
+      <return type-id='type-id-468'/>
     </function-decl>
     <!-- gnu_v3_dtor_kinds is_gnu_v3_mangled_dtor(const char*) -->
     <function-decl name='is_gnu_v3_mangled_dtor' mangled-name='is_gnu_v3_mangled_dtor' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_gnu_v3_mangled_dtor'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='name' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1'/>
       <!-- enum gnu_v3_dtor_kinds -->
-      <return type-id='type-id-470'/>
+      <return type-id='type-id-469'/>
     </function-decl>
     <!-- const demangle_operator_info cplus_demangle_operators[58] -->
-    <var-decl name='cplus_demangle_operators' type-id='type-id-445' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
+    <var-decl name='cplus_demangle_operators' type-id='type-id-444' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
     <!-- const demangle_builtin_type_info cplus_demangle_builtin_types[33] -->
-    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-442' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
+    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-441' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
     <!-- void* realloc(void*, size_t) -->
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -11768,7 +11750,7 @@ 
       <return type-id='type-id-14'/>
     </function-decl>
     <!-- void (const char*, size_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-480'>
+    <function-type size-in-bits='64' id='type-id-479'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -11781,17 +11763,17 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const demangler_engine[11] -->
-    <array-type-def dimensions='1' type-id='type-id-481' size-in-bits='2112' id='type-id-482'>
+    <array-type-def dimensions='1' type-id='type-id-480' size-in-bits='2112' id='type-id-481'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-4' id='type-id-483'/>
+      <subrange length='11' type-id='type-id-4' id='type-id-482'/>
     </array-type-def>
     <!-- demangler_engine[11] -->
-    <array-type-def dimensions='1' type-id='type-id-484' size-in-bits='2112' id='type-id-485'>
+    <array-type-def dimensions='1' type-id='type-id-483' size-in-bits='2112' id='type-id-484'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-4' id='type-id-483'/>
+      <subrange length='11' type-id='type-id-4' id='type-id-482'/>
     </array-type-def>
     <!-- enum demangling_styles -->
-    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-486'>
+    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-485'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='no_demangling' value='-1'/>
       <enumerator name='unknown_demangling' value='0'/>
@@ -11806,26 +11788,26 @@ 
       <enumerator name='gnat_demangling' value='32768'/>
     </enum-decl>
     <!-- struct demangler_engine -->
-    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-484'>
+    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-483'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* const demangler_engine::demangling_style_name -->
-        <var-decl name='demangling_style_name' type-id='type-id-487' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
+        <var-decl name='demangling_style_name' type-id='type-id-486' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const demangling_styles demangler_engine::demangling_style -->
-        <var-decl name='demangling_style' type-id='type-id-488' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
+        <var-decl name='demangling_style' type-id='type-id-487' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char* const demangler_engine::demangling_style_doc -->
-        <var-decl name='demangling_style_doc' type-id='type-id-487' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
+        <var-decl name='demangling_style_doc' type-id='type-id-486' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
       </data-member>
     </class-decl>
     <!-- const char* const -->
-    <qualified-type-def type-id='type-id-15' const='yes' id='type-id-487'/>
+    <qualified-type-def type-id='type-id-15' const='yes' id='type-id-486'/>
     <!-- const demangler_engine -->
-    <qualified-type-def type-id='type-id-484' const='yes' id='type-id-481'/>
+    <qualified-type-def type-id='type-id-483' const='yes' id='type-id-480'/>
     <!-- const demangling_styles -->
-    <qualified-type-def type-id='type-id-486' const='yes' id='type-id-488'/>
+    <qualified-type-def type-id='type-id-485' const='yes' id='type-id-487'/>
     <!-- void set_cplus_marker_for_demangling(int) -->
     <function-decl name='set_cplus_marker_for_demangling' mangled-name='set_cplus_marker_for_demangling' filepath='../.././libiberty/cplus-dem.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_cplus_marker_for_demangling'>
       <!-- parameter of type 'int' -->
@@ -11845,16 +11827,16 @@ 
     <!-- demangling_styles cplus_demangle_set_style(demangling_styles) -->
     <function-decl name='cplus_demangle_set_style' mangled-name='cplus_demangle_set_style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_set_style'>
       <!-- parameter of type 'enum demangling_styles' -->
-      <parameter type-id='type-id-486' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
+      <parameter type-id='type-id-485' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
       <!-- enum demangling_styles -->
-      <return type-id='type-id-486'/>
+      <return type-id='type-id-485'/>
     </function-decl>
     <!-- demangling_styles cplus_demangle_name_to_style(const char*) -->
     <function-decl name='cplus_demangle_name_to_style' mangled-name='cplus_demangle_name_to_style' filepath='../.././libiberty/cplus-dem.c' line='802' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_name_to_style'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-15' name='name' filepath='../.././libiberty/cplus-dem.c' line='802' column='1'/>
       <!-- enum demangling_styles -->
-      <return type-id='type-id-486'/>
+      <return type-id='type-id-485'/>
     </function-decl>
     <!-- char* ada_demangle(const char*, int) -->
     <function-decl name='ada_demangle' mangled-name='ada_demangle' filepath='../.././libiberty/cplus-dem.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ada_demangle'>
@@ -11877,9 +11859,9 @@ 
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- demangling_styles current_demangling_style -->
-    <var-decl name='current_demangling_style' type-id='type-id-486' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
+    <var-decl name='current_demangling_style' type-id='type-id-485' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
     <!-- const demangler_engine libiberty_demanglers[11] -->
-    <var-decl name='libiberty_demanglers' type-id='type-id-482' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
+    <var-decl name='libiberty_demanglers' type-id='type-id-481' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
     <!-- char* cplus_demangle_v3(const char*, int) -->
     <function-decl name='cplus_demangle_v3' mangled-name='cplus_demangle_v3' filepath='../.././libiberty/../include/demangle.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_v3'>
       <!-- parameter of type 'const char*' -->
@@ -11970,11 +11952,11 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/hashtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- double -->
-    <type-decl name='double' size-in-bits='64' id='type-id-489'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-488'/>
     <!-- size_t htab_size(htab_t) -->
     <function-decl name='htab_size' mangled-name='htab_size' filepath='../.././libiberty/hashtab.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_size'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
       <!-- typedef size_t -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -11983,55 +11965,55 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='size' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-229' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-231' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
+      <parameter type-id='type-id-232' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <!-- parameter of type 'typedef htab_alloc_with_arg' -->
-      <parameter type-id='type-id-238' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
+      <parameter type-id='type-id-237' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
       <!-- parameter of type 'typedef htab_free_with_arg' -->
-      <parameter type-id='type-id-240' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
+      <parameter type-id='type-id-239' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-227'/>
     </function-decl>
     <!-- htab_t htab_create_typed_alloc(size_t, htab_hash, htab_eq, htab_del, htab_alloc, htab_alloc, htab_free) -->
     <function-decl name='htab_create_typed_alloc' mangled-name='htab_create_typed_alloc' filepath='../.././libiberty/hashtab.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_create_typed_alloc'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='size' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-229' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-231' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-232' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-235' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-234' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-235' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-234' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
       <!-- parameter of type 'typedef htab_free' -->
-      <parameter type-id='type-id-236' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-235' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-227'/>
     </function-decl>
     <!-- void htab_set_functions_ex(htab_t, htab_hash, htab_eq, htab_del, void*, htab_alloc_with_arg, htab_free_with_arg) -->
     <function-decl name='htab_set_functions_ex' mangled-name='htab_set_functions_ex' filepath='../.././libiberty/hashtab.c' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_set_functions_ex'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-229' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-231' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
+      <parameter type-id='type-id-232' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <!-- parameter of type 'typedef htab_alloc_with_arg' -->
-      <parameter type-id='type-id-238' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-237' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <!-- parameter of type 'typedef htab_free_with_arg' -->
-      <parameter type-id='type-id-240' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-239' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -12040,25 +12022,25 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='size' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-229' name='hash_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-231' name='eq_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-232' name='del_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-227'/>
     </function-decl>
     <!-- void htab_empty(htab_t) -->
     <function-decl name='htab_empty' mangled-name='htab_empty' filepath='../.././libiberty/hashtab.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_empty'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void* htab_find(htab_t, void*) -->
     <function-decl name='htab_find' mangled-name='htab_find' filepath='../.././libiberty/hashtab.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='element' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <!-- void* -->
@@ -12067,29 +12049,29 @@ 
     <!-- void** htab_find_slot(htab_t, void*, insert_option) -->
     <function-decl name='htab_find_slot' mangled-name='htab_find_slot' filepath='../.././libiberty/hashtab.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find_slot'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='element' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- parameter of type 'enum insert_option' -->
-      <parameter type-id='type-id-241' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-240' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- void** -->
       <return type-id='type-id-100'/>
     </function-decl>
     <!-- void htab_remove_elt_with_hash(htab_t, void*, hashval_t) -->
     <function-decl name='htab_remove_elt_with_hash' mangled-name='htab_remove_elt_with_hash' filepath='../.././libiberty/hashtab.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt_with_hash'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='element' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-226' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-225' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void htab_remove_elt(htab_t, void*) -->
     <function-decl name='htab_remove_elt' mangled-name='htab_remove_elt' filepath='../.././libiberty/hashtab.c' line='721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='element' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <!-- void -->
@@ -12098,7 +12080,7 @@ 
     <!-- void htab_clear_slot(htab_t, void**) -->
     <function-decl name='htab_clear_slot' mangled-name='htab_clear_slot' filepath='../.././libiberty/hashtab.c' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_clear_slot'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-100' name='slot' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <!-- void -->
@@ -12107,9 +12089,9 @@ 
     <!-- void htab_traverse_noresize(htab_t, htab_trav, void*) -->
     <function-decl name='htab_traverse_noresize' mangled-name='htab_traverse_noresize' filepath='../.././libiberty/hashtab.c' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_traverse_noresize'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- parameter of type 'typedef htab_trav' -->
-      <parameter type-id='type-id-406' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-405' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='info' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- void -->
@@ -12118,9 +12100,9 @@ 
     <!-- double htab_collisions(htab_t) -->
     <function-decl name='htab_collisions' mangled-name='htab_collisions' filepath='../.././libiberty/hashtab.c' line='807' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_collisions'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
+      <parameter type-id='type-id-227' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
       <!-- double -->
-      <return type-id='type-id-489'/>
+      <return type-id='type-id-488'/>
     </function-decl>
     <!-- hashval_t iterative_hash(void*, size_t, hashval_t) -->
     <function-decl name='iterative_hash' mangled-name='iterative_hash' filepath='../.././libiberty/hashtab.c' line='931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iterative_hash'>
@@ -12129,14 +12111,14 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='length' filepath='../.././libiberty/hashtab.c' line='932' column='1'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-226' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
+      <parameter type-id='type-id-225' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-226'/>
+      <return type-id='type-id-225'/>
     </function-decl>
     <!-- htab_hash htab_hash_pointer -->
-    <var-decl name='htab_hash_pointer' type-id='type-id-230' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
+    <var-decl name='htab_hash_pointer' type-id='type-id-229' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
     <!-- htab_eq htab_eq_pointer -->
-    <var-decl name='htab_eq_pointer' type-id='type-id-232' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
+    <var-decl name='htab_eq_pointer' type-id='type-id-231' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void hex_init() -->
@@ -12145,7 +12127,7 @@ 
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- const unsigned char _hex_value[256] -->
-    <var-decl name='_hex_value' type-id='type-id-415' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
+    <var-decl name='_hex_value' type-id='type-id-414' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const char* unix_lbasename(const char*) -->
@@ -12181,35 +12163,35 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- md5_uint32[2] -->
-    <array-type-def dimensions='1' type-id='type-id-490' size-in-bits='64' id='type-id-491'>
+    <array-type-def dimensions='1' type-id='type-id-489' size-in-bits='64' id='type-id-490'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-4' id='type-id-492'/>
+      <subrange length='2' type-id='type-id-4' id='type-id-491'/>
     </array-type-def>
     <!-- struct md5_ctx -->
-    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-493'>
+    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-492'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- md5_uint32 md5_ctx::A -->
-        <var-decl name='A' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
+        <var-decl name='A' type-id='type-id-489' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- md5_uint32 md5_ctx::B -->
-        <var-decl name='B' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
+        <var-decl name='B' type-id='type-id-489' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- md5_uint32 md5_ctx::C -->
-        <var-decl name='C' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
+        <var-decl name='C' type-id='type-id-489' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- md5_uint32 md5_ctx::D -->
-        <var-decl name='D' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
+        <var-decl name='D' type-id='type-id-489' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- md5_uint32 md5_ctx::total[2] -->
-        <var-decl name='total' type-id='type-id-491' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
+        <var-decl name='total' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- md5_uint32 md5_ctx::buflen -->
-        <var-decl name='buflen' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
+        <var-decl name='buflen' type-id='type-id-489' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- char md5_ctx::buffer[128] -->
@@ -12217,26 +12199,26 @@ 
       </data-member>
     </class-decl>
     <!-- typedef uint32_t md5_uint32 -->
-    <typedef-decl name='md5_uint32' type-id='type-id-494' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-490'/>
+    <typedef-decl name='md5_uint32' type-id='type-id-493' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-489'/>
     <!-- typedef unsigned int uint32_t -->
-    <typedef-decl name='uint32_t' type-id='type-id-13' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-494'/>
+    <typedef-decl name='uint32_t' type-id='type-id-13' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-493'/>
     <!-- const md5_ctx -->
-    <qualified-type-def type-id='type-id-493' const='yes' id='type-id-495'/>
+    <qualified-type-def type-id='type-id-492' const='yes' id='type-id-494'/>
     <!-- const md5_ctx* -->
-    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-494' size-in-bits='64' id='type-id-495'/>
     <!-- md5_ctx* -->
-    <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-497'/>
+    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-496'/>
     <!-- void md5_init_ctx(md5_ctx*) -->
     <function-decl name='md5_init_ctx' mangled-name='md5_init_ctx' filepath='../.././libiberty/md5.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_init_ctx'>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
+      <parameter type-id='type-id-496' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void* md5_read_ctx(const md5_ctx*, void*) -->
     <function-decl name='md5_read_ctx' mangled-name='md5_read_ctx' filepath='../.././libiberty/md5.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_read_ctx'>
       <!-- parameter of type 'const md5_ctx*' -->
-      <parameter type-id='type-id-496' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
+      <parameter type-id='type-id-495' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='resbuf' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <!-- void* -->
@@ -12249,7 +12231,7 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='len' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
+      <parameter type-id='type-id-496' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -12260,14 +12242,14 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='len' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
+      <parameter type-id='type-id-496' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void* md5_finish_ctx(md5_ctx*, void*) -->
     <function-decl name='md5_finish_ctx' mangled-name='md5_finish_ctx' filepath='../.././libiberty/md5.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_finish_ctx'>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
+      <parameter type-id='type-id-496' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-14' name='resbuf' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <!-- void* -->
@@ -12595,7 +12577,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-339'/>
+      <parameter type-id='type-id-338'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42'/>
       <!-- typedef pid_t -->
@@ -12614,7 +12596,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-339'/>
+      <parameter type-id='type-id-338'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42'/>
       <!-- typedef pid_t -->
@@ -12630,12 +12612,12 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- typedef __anonymous_union__ __WAIT_STATUS -->
-    <typedef-decl name='__WAIT_STATUS' type-id='type-id-498' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-499'/>
+    <typedef-decl name='__WAIT_STATUS' type-id='type-id-497' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-498'/>
     <!-- union {wait* __uptr; int* __iptr;} -->
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-498'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-497'>
       <data-member access='private'>
         <!-- wait* __uptr -->
-        <var-decl name='__uptr' type-id='type-id-500' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
+        <var-decl name='__uptr' type-id='type-id-499' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- int* __iptr -->
@@ -12643,22 +12625,22 @@ 
       </data-member>
     </union-decl>
     <!-- union wait -->
-    <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-501'>
+    <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-500'>
       <data-member access='private'>
         <!-- int wait::w_status -->
         <var-decl name='w_status' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='69' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {unsigned int __w_termsig; unsigned int __w_coredump; unsigned int __w_retcode;} wait::__wait_terminated -->
-        <var-decl name='__wait_terminated' type-id='type-id-502' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
+        <var-decl name='__wait_terminated' type-id='type-id-501' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {unsigned int __w_stopval; unsigned int __w_stopsig;} wait::__wait_stopped -->
-        <var-decl name='__wait_stopped' type-id='type-id-503' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
+        <var-decl name='__wait_stopped' type-id='type-id-502' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
       </data-member>
     </union-decl>
     <!-- struct {unsigned int __w_termsig; unsigned int __w_coredump; unsigned int __w_retcode;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-502'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-501'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int __w_termsig -->
         <var-decl name='__w_termsig' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='73' column='1'/>
@@ -12673,7 +12655,7 @@ 
       </data-member>
     </class-decl>
     <!-- struct {unsigned int __w_stopval; unsigned int __w_stopsig;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-503'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-502'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int __w_stopval -->
         <var-decl name='__w_stopval' type-id='type-id-13' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='88' column='1'/>
@@ -12684,14 +12666,14 @@ 
       </data-member>
     </class-decl>
     <!-- struct rusage -->
-    <class-decl name='rusage' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='178' column='1' id='type-id-504'>
+    <class-decl name='rusage' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='178' column='1' id='type-id-503'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- timeval rusage::ru_utime -->
-        <var-decl name='ru_utime' type-id='type-id-505' visibility='default' filepath='/usr/include/bits/resource.h' line='181' column='1'/>
+        <var-decl name='ru_utime' type-id='type-id-504' visibility='default' filepath='/usr/include/bits/resource.h' line='181' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- timeval rusage::ru_stime -->
-        <var-decl name='ru_stime' type-id='type-id-505' visibility='default' filepath='/usr/include/bits/resource.h' line='183' column='1'/>
+        <var-decl name='ru_stime' type-id='type-id-504' visibility='default' filepath='/usr/include/bits/resource.h' line='183' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- long int rusage::ru_maxrss -->
@@ -12751,22 +12733,22 @@ 
       </data-member>
     </class-decl>
     <!-- struct timeval -->
-    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-505'>
+    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-504'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- __time_t timeval::tv_sec -->
         <var-decl name='tv_sec' type-id='type-id-82' visibility='default' filepath='/usr/include/bits/time.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- __suseconds_t timeval::tv_usec -->
-        <var-decl name='tv_usec' type-id='type-id-506' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
+        <var-decl name='tv_usec' type-id='type-id-505' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef long int __suseconds_t -->
-    <typedef-decl name='__suseconds_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-506'/>
+    <typedef-decl name='__suseconds_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-505'/>
     <!-- rusage* -->
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-507'/>
+    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-506'/>
     <!-- wait* -->
-    <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-500'/>
+    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-499'/>
     <!-- const pex_funcs funcs -->
     <var-decl name='funcs' type-id='type-id-153' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
     <!-- int fcntl(int, int, ...) -->
@@ -12791,11 +12773,11 @@ 
       <!-- parameter of type 'typedef __pid_t' -->
       <parameter type-id='type-id-161'/>
       <!-- parameter of type 'typedef __WAIT_STATUS' -->
-      <parameter type-id='type-id-499'/>
+      <parameter type-id='type-id-498'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'rusage*' -->
-      <parameter type-id='type-id-507'/>
+      <parameter type-id='type-id-506'/>
       <!-- typedef __pid_t -->
       <return type-id='type-id-161'/>
     </function-decl>
@@ -12828,7 +12810,7 @@ 
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32'/>
       <!-- typedef ssize_t -->
-      <return type-id='type-id-400'/>
+      <return type-id='type-id-399'/>
     </function-decl>
     <!-- void _exit(int) -->
     <function-decl name='_exit' filepath='/usr/include/unistd.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12879,23 +12861,23 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/safe-ctype.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const unsigned short int[256] -->
-    <array-type-def dimensions='1' type-id='type-id-508' size-in-bits='4096' id='type-id-509'>
+    <array-type-def dimensions='1' type-id='type-id-507' size-in-bits='4096' id='type-id-508'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-4' id='type-id-398'/>
+      <subrange length='256' type-id='type-id-4' id='type-id-397'/>
     </array-type-def>
     <!-- unsigned short int[256] -->
-    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='4096' id='type-id-510'>
+    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='4096' id='type-id-509'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-4' id='type-id-398'/>
+      <subrange length='256' type-id='type-id-4' id='type-id-397'/>
     </array-type-def>
     <!-- const unsigned short int -->
-    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-508'/>
+    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-507'/>
     <!-- const unsigned short int _sch_istable[256] -->
-    <var-decl name='_sch_istable' type-id='type-id-509' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
+    <var-decl name='_sch_istable' type-id='type-id-508' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
     <!-- const unsigned char _sch_toupper[256] -->
-    <var-decl name='_sch_toupper' type-id='type-id-415' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
+    <var-decl name='_sch_toupper' type-id='type-id-414' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
     <!-- const unsigned char _sch_tolower[256] -->
-    <var-decl name='_sch_tolower' type-id='type-id-415' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
+    <var-decl name='_sch_tolower' type-id='type-id-414' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- int __lxstat(int, const char*, stat*) -->
@@ -12916,9 +12898,9 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- typedef __intptr_t intptr_t -->
-    <typedef-decl name='intptr_t' type-id='type-id-511' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-512'/>
+    <typedef-decl name='intptr_t' type-id='type-id-510' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-511'/>
     <!-- typedef long int __intptr_t -->
-    <typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-511'/>
+    <typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-510'/>
     <!-- void xmalloc_failed(size_t) -->
     <function-decl name='xmalloc_failed' mangled-name='xmalloc_failed' filepath='../.././libiberty/xmalloc.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xmalloc_failed'>
       <!-- parameter of type 'typedef size_t' -->
@@ -12929,7 +12911,7 @@ 
     <!-- void* sbrk(intptr_t) -->
     <function-decl name='sbrk' filepath='/usr/include/unistd.h' line='1053' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef intptr_t' -->
-      <parameter type-id='type-id-512'/>
+      <parameter type-id='type-id-511'/>
       <!-- void* -->
       <return type-id='type-id-14'/>
     </function-decl>
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index 4b5976be..6d4fc97e 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -1,7 +1,7 @@ 
 ================ changes of 'libflatpak.so.0.10204.0'===============
-  Functions changes summary: 0 Removed, 0 Changed (16 filtered out), 16 Added functions
+  Functions changes summary: 0 Removed, 0 Changed (10 filtered out), 16 Added functions
   Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
-  Unreachable types summary: 3 removed (2 filtered out), 1 changed (15 filtered out), 3 added (1 filtered out) types
+  Unreachable types summary: 3 removed (1 filtered out), 1 changed (14 filtered out), 3 added (1 filtered out) types
 
   16 Added functions:
 
diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index 9afaed4e..f62905de 100644
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -16,7 +16,7 @@ 
 ================ end of changes of 'libnss3.so'===============
 
 ================ changes of 'libssl3.so'===============
-  Functions changes summary: 0 Removed, 2 Changed (12 filtered out), 1 Added functions
+  Functions changes summary: 0 Removed, 2 Changed (7 filtered out), 1 Added functions
   Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
   1 Added function:
@@ -41,7 +41,7 @@ 
             type size hasn't changed
             1 data member insertion:
               'SSLAuthType authType', at offset 736 (in bits) at sslt.h:250:1
-            1 data member changes (3 filtered):
+            1 data member changes (1 filtered):
               type of 'SSLAuthType authAlgorithm' changed:
                 underlying type 'enum __anonymous_enum__' at sslt.h:87:1 changed:
                   type size hasn't changed
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index d5d9ecf1..d1e2e607 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -5026,10 +5026,7 @@ 
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-60'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <enum-decl name='__anonymous_enum__1' is-anonymous='yes' is-declaration-only='yes' id='type-id-434'>
-        <underlying-type type-id='type-id-21'/>
-      </enum-decl>
-      <typedef-decl name='streamsize' type-id='type-id-155' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='98' column='1' id='type-id-435'/>
+      <typedef-decl name='streamsize' type-id='type-id-155' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='98' column='1' id='type-id-434'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-95'/>
       <function-decl name='operator+&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_'>
         <parameter type-id='type-id-73' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1151' column='1'/>
@@ -5044,18 +5041,18 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-436'>
+      <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-435'>
         <member-type access='private'>
-          <typedef-decl name='iostate' type-id='type-id-154' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='398' column='1' id='type-id-437'/>
+          <typedef-decl name='iostate' type-id='type-id-154' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='398' column='1' id='type-id-436'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='openmode' type-id='type-id-434' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-438'/>
+          <typedef-decl name='openmode' type-id='type-id-154' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-437'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-439'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-438'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-439'/>
+          <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-438'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-95'/>
@@ -5165,7 +5162,7 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'/>
       <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-440'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-439'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'/>
@@ -5218,7 +5215,7 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-441'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-440'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
@@ -5241,16 +5238,16 @@ 
       <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
       <class-decl name='__anonymous_struct__18' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-442'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-441'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-442'/>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-441'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-442'/>
+          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-441'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-442'/>
+          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-441'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
@@ -5275,13 +5272,13 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/file_writer.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='632' id='type-id-443'>
-      <subrange length='79' type-id='type-id-4' id='type-id-444'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='632' id='type-id-442'>
+      <subrange length='79' type-id='type-id-4' id='type-id-443'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='632' id='type-id-445'>
-      <subrange length='79' type-id='type-id-4' id='type-id-444'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='632' id='type-id-444'>
+      <subrange length='79' type-id='type-id-4' id='type-id-443'/>
     </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-445' size-in-bits='64' id='type-id-446'/>
+    <reference-type-def kind='lvalue' type-id='type-id-444' size-in-bits='64' id='type-id-445'/>
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-271'/>
@@ -5298,14 +5295,14 @@ 
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2ERKS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-65' is-artificial='yes'/>
-              <parameter type-id='type-id-447'/>
+              <parameter type-id='type-id-446'/>
               <return type-id='type-id-26'/>
             </function-decl>
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-64'>
           <member-type access='public'>
-            <typedef-decl name='argument_type' type-id='type-id-197' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='164' column='1' id='type-id-447'/>
+            <typedef-decl name='argument_type' type-id='type-id-197' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='164' column='1' id='type-id-446'/>
           </member-type>
         </class-decl>
         <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-64'/>
@@ -5319,7 +5316,7 @@ 
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-60'>
         <member-type access='private'>
-          <typedef-decl name='argument_type' type-id='type-id-447' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='782' column='1' id='type-id-448'/>
+          <typedef-decl name='argument_type' type-id='type-id-446' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='782' column='1' id='type-id-447'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2ENS_6none_tE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='790' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5331,7 +5328,7 @@ 
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2ERKS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-63' is-artificial='yes'/>
-            <parameter type-id='type-id-448'/>
+            <parameter type-id='type-id-447'/>
             <return type-id='type-id-26'/>
           </function-decl>
         </member-function>
@@ -5361,7 +5358,7 @@ 
       <namespace-decl name='logger'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-288'>
           <member-type access='private'>
-            <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-449'>
+            <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-448'>
               <underlying-type type-id='type-id-21'/>
             </enum-decl>
           </member-type>
@@ -5452,7 +5449,7 @@ 
       <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
       <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
         <member-type access='private'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-450'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-449'>
             <underlying-type type-id='type-id-21'/>
           </enum-decl>
         </member-type>
@@ -5461,10 +5458,10 @@ 
       <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
       <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-451'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-450'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-451'/>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-450'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
@@ -5481,7 +5478,7 @@ 
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'/>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-452'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-451'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'/>
@@ -5493,40 +5490,40 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/util.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-453'>
-      <subrange length='7' type-id='type-id-4' id='type-id-454'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-452'>
+      <subrange length='7' type-id='type-id-4' id='type-id-453'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-455'>
-      <subrange length='8' type-id='type-id-4' id='type-id-456'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-454'>
+      <subrange length='8' type-id='type-id-4' id='type-id-455'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='32' id='type-id-457'>
-      <subrange length='4' type-id='type-id-4' id='type-id-458'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='32' id='type-id-456'>
+      <subrange length='4' type-id='type-id-4' id='type-id-457'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='40' id='type-id-459'>
-      <subrange length='5' type-id='type-id-4' id='type-id-460'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='40' id='type-id-458'>
+      <subrange length='5' type-id='type-id-4' id='type-id-459'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='48' id='type-id-461'>
-      <subrange length='6' type-id='type-id-4' id='type-id-462'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='48' id='type-id-460'>
+      <subrange length='6' type-id='type-id-4' id='type-id-461'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='56' id='type-id-463'>
-      <subrange length='7' type-id='type-id-4' id='type-id-454'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='56' id='type-id-462'>
+      <subrange length='7' type-id='type-id-4' id='type-id-453'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-464'>
-      <subrange length='8' type-id='type-id-4' id='type-id-456'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-463'>
+      <subrange length='8' type-id='type-id-4' id='type-id-455'/>
     </array-type-def>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-465'/>
-    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-466'/>
-    <reference-type-def kind='lvalue' type-id='type-id-466' size-in-bits='64' id='type-id-467'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-464'/>
+    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-465'/>
+    <reference-type-def kind='lvalue' type-id='type-id-465' size-in-bits='64' id='type-id-466'/>
+    <reference-type-def kind='lvalue' type-id='type-id-462' size-in-bits='64' id='type-id-467'/>
     <reference-type-def kind='lvalue' type-id='type-id-463' size-in-bits='64' id='type-id-468'/>
-    <reference-type-def kind='lvalue' type-id='type-id-464' size-in-bits='64' id='type-id-469'/>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-470'/>
-    <reference-type-def kind='lvalue' type-id='type-id-470' size-in-bits='64' id='type-id-471'/>
-    <reference-type-def kind='lvalue' type-id='type-id-16' size-in-bits='64' id='type-id-472'/>
-    <reference-type-def kind='rvalue' type-id='type-id-19' size-in-bits='64' id='type-id-473'/>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-474'/>
-    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-475'/>
-    <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-476'/>
-    <reference-type-def kind='rvalue' type-id='type-id-23' size-in-bits='64' id='type-id-477'/>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-469'/>
+    <reference-type-def kind='lvalue' type-id='type-id-469' size-in-bits='64' id='type-id-470'/>
+    <reference-type-def kind='lvalue' type-id='type-id-16' size-in-bits='64' id='type-id-471'/>
+    <reference-type-def kind='rvalue' type-id='type-id-19' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-473'/>
+    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-464' size-in-bits='64' id='type-id-475'/>
+    <reference-type-def kind='rvalue' type-id='type-id-23' size-in-bits='64' id='type-id-476'/>
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-271'>
@@ -5560,12 +5557,12 @@ 
     <namespace-decl name='std'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-95'>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-479' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='230' column='1' id='type-id-478'/>
+          <typedef-decl name='const_reference' type-id='type-id-478' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='230' column='1' id='type-id-477'/>
         </member-type>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;long long&gt;' mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJxEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/vector.tcc' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJxEEEvDpOT_'>
             <parameter type-id='type-id-130' is-artificial='yes'/>
-            <parameter type-id='type-id-473'/>
+            <parameter type-id='type-id-472'/>
             <return type-id='type-id-26'/>
           </function-decl>
         </member-function>
@@ -5579,7 +5576,7 @@ 
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;unsigned int&gt;' mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJjEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/vector.tcc' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJjEEEvDpOT_'>
             <parameter type-id='type-id-130' is-artificial='yes'/>
-            <parameter type-id='type-id-477'/>
+            <parameter type-id='type-id-476'/>
             <return type-id='type-id-26'/>
           </function-decl>
         </member-function>
@@ -5591,7 +5588,7 @@ 
       <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-95'/>
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-95'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-480'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-479'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-95'/>
@@ -5602,10 +5599,7 @@ 
       <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-95'/>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-481'>
-        <underlying-type type-id='type-id-21'/>
-      </enum-decl>
-      <enum-decl name='__anonymous_enum__1' is-anonymous='yes' is-declaration-only='yes' id='type-id-482'>
+      <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-480'>
         <underlying-type type-id='type-id-21'/>
       </enum-decl>
       <namespace-decl name='logger'>
@@ -5614,14 +5608,14 @@ 
         <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-288'/>
       </namespace-decl>
       <var-decl name='kFTDCInterimFile' type-id='type-id-414' mangled-name='_ZN5mongo16kFTDCInterimFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='51' column='1' elf-symbol-id='_ZN5mongo16kFTDCInterimFileE'/>
-      <var-decl name='kFTDCArchiveFile' type-id='type-id-464' mangled-name='_ZN5mongo16kFTDCArchiveFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='53' column='1' elf-symbol-id='_ZN5mongo16kFTDCArchiveFileE'/>
-      <var-decl name='kFTDCIdField' type-id='type-id-457' mangled-name='_ZN5mongo12kFTDCIdFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='55' column='1' elf-symbol-id='_ZN5mongo12kFTDCIdFieldE'/>
-      <var-decl name='kFTDCTypeField' type-id='type-id-459' mangled-name='_ZN5mongo14kFTDCTypeFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='56' column='1' elf-symbol-id='_ZN5mongo14kFTDCTypeFieldE'/>
-      <var-decl name='kFTDCDataField' type-id='type-id-459' mangled-name='_ZN5mongo14kFTDCDataFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='58' column='1' elf-symbol-id='_ZN5mongo14kFTDCDataFieldE'/>
-      <var-decl name='kFTDCDocField' type-id='type-id-457' mangled-name='_ZN5mongo13kFTDCDocFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='59' column='1' elf-symbol-id='_ZN5mongo13kFTDCDocFieldE'/>
-      <var-decl name='kFTDCDocsField' type-id='type-id-459' mangled-name='_ZN5mongo14kFTDCDocsFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='61' column='1' elf-symbol-id='_ZN5mongo14kFTDCDocsFieldE'/>
-      <var-decl name='kFTDCCollectStartField' type-id='type-id-461' mangled-name='_ZN5mongo22kFTDCCollectStartFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='63' column='1' elf-symbol-id='_ZN5mongo22kFTDCCollectStartFieldE'/>
-      <var-decl name='kFTDCCollectEndField' type-id='type-id-457' mangled-name='_ZN5mongo20kFTDCCollectEndFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='64' column='1' elf-symbol-id='_ZN5mongo20kFTDCCollectEndFieldE'/>
+      <var-decl name='kFTDCArchiveFile' type-id='type-id-463' mangled-name='_ZN5mongo16kFTDCArchiveFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='53' column='1' elf-symbol-id='_ZN5mongo16kFTDCArchiveFileE'/>
+      <var-decl name='kFTDCIdField' type-id='type-id-456' mangled-name='_ZN5mongo12kFTDCIdFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='55' column='1' elf-symbol-id='_ZN5mongo12kFTDCIdFieldE'/>
+      <var-decl name='kFTDCTypeField' type-id='type-id-458' mangled-name='_ZN5mongo14kFTDCTypeFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='56' column='1' elf-symbol-id='_ZN5mongo14kFTDCTypeFieldE'/>
+      <var-decl name='kFTDCDataField' type-id='type-id-458' mangled-name='_ZN5mongo14kFTDCDataFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='58' column='1' elf-symbol-id='_ZN5mongo14kFTDCDataFieldE'/>
+      <var-decl name='kFTDCDocField' type-id='type-id-456' mangled-name='_ZN5mongo13kFTDCDocFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='59' column='1' elf-symbol-id='_ZN5mongo13kFTDCDocFieldE'/>
+      <var-decl name='kFTDCDocsField' type-id='type-id-458' mangled-name='_ZN5mongo14kFTDCDocsFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='61' column='1' elf-symbol-id='_ZN5mongo14kFTDCDocsFieldE'/>
+      <var-decl name='kFTDCCollectStartField' type-id='type-id-460' mangled-name='_ZN5mongo22kFTDCCollectStartFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='63' column='1' elf-symbol-id='_ZN5mongo22kFTDCCollectStartFieldE'/>
+      <var-decl name='kFTDCCollectEndField' type-id='type-id-456' mangled-name='_ZN5mongo20kFTDCCollectEndFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='64' column='1' elf-symbol-id='_ZN5mongo20kFTDCCollectEndFieldE'/>
       <namespace-decl name='FTDCBSONUtil'>
         <function-decl name='extractMetricsFromDocument' mangled-name='_ZN5mongo12FTDCBSONUtil26extractMetricsFromDocumentERKNS_7BSONObjES3_PSt6vectorImSaImEE' filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil26extractMetricsFromDocumentERKNS_7BSONObjES3_PSt6vectorImSaImEE'>
           <parameter type-id='type-id-197' name='referenceDoc' filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1'/>
@@ -5757,7 +5751,7 @@ 
         <member-function access='private'>
           <function-decl name='chk' mangled-name='_ZNK5mongo11BSONElement3chkENS_8BSONTypeE' filepath='src/mongo/bson/bsonelement.h' line='692' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo11BSONElement3chkENS_8BSONTypeE'>
             <parameter type-id='type-id-88' is-artificial='yes'/>
-            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-480'/>
             <return type-id='type-id-197'/>
           </function-decl>
         </member-function>
@@ -5765,14 +5759,14 @@ 
       <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
       <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-483'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-481'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
       <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
       <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-442'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-441'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
@@ -5793,7 +5787,7 @@ 
             <parameter type-id='type-id-126' is-artificial='yes'/>
             <parameter type-id='type-id-86'/>
             <parameter type-id='type-id-16'/>
-            <parameter type-id='type-id-482'/>
+            <parameter type-id='type-id-480'/>
             <parameter type-id='type-id-146'/>
             <return type-id='type-id-124'/>
           </function-decl>
@@ -5859,7 +5853,7 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__26' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
         <member-type access='private'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-484'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-482'>
             <underlying-type type-id='type-id-21'/>
           </enum-decl>
         </member-type>
@@ -5869,7 +5863,7 @@ 
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-467' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='110' column='1' id='type-id-479'/>
+          <typedef-decl name='const_reference' type-id='type-id-466' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='110' column='1' id='type-id-478'/>
         </member-type>
         <member-type access='public'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-182'/>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 0ee423dc..8ef29eea 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -13708,12 +13708,6 @@ 
         <class-decl name='reverse_iterator&lt;std::__1::__wrap_iter&lt;const android::ApkAssets *const *&gt; &gt;' visibility='default' is-declaration-only='yes' id='89a22f89'/>
         <class-decl name='__split_buffer&lt;const android::ApkAssets *, std::__1::allocator&lt;const android::ApkAssets *&gt; &amp;&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='4c29fac1'/>
         <class-decl name='basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='27619c1c'>
-          <member-type access='private'>
-            <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='external/libcxx/include/string' line='1535' column='1' id='2bd287ae'>
-              <underlying-type type-id='9cac1fee'/>
-              <enumerator name='__alignment' value='16'/>
-            </enum-decl>
-          </member-type>
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='cbcf5557' filepath='external/libcxx/include/string' line='682' column='1' id='dc224b08'/>
           </member-type>
@@ -13724,7 +13718,7 @@ 
             </enum-decl>
           </member-type>
           <member-type access='private'>
-            <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='external/libcxx/include/string' line='1535' column='1' id='2ad2861b'>
+            <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='external/libcxx/include/string' line='1535' column='1' id='288a5e69'>
               <underlying-type type-id='9cac1fee'/>
               <enumerator name='__alignment' value='16'/>
             </enum-decl>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index 988e4cf8..469c9fc0 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -1862,29 +1862,12 @@ 
     </class-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='12diagnostic_t' filepath='../.././gcc/diagnostic-core.h' line='32' column='1' id='type-id-185'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='DK_UNSPECIFIED' value='0'/>
-      <enumerator name='DK_IGNORED' value='1'/>
-      <enumerator name='DK_FATAL' value='2'/>
-      <enumerator name='DK_ICE' value='3'/>
-      <enumerator name='DK_ERROR' value='4'/>
-      <enumerator name='DK_SORRY' value='5'/>
-      <enumerator name='DK_WARNING' value='6'/>
-      <enumerator name='DK_ANACHRONISM' value='7'/>
-      <enumerator name='DK_NOTE' value='8'/>
-      <enumerator name='DK_DEBUG' value='9'/>
-      <enumerator name='DK_PEDWARN' value='10'/>
-      <enumerator name='DK_PERMERROR' value='11'/>
-      <enumerator name='DK_LAST_DIAGNOSTIC_KIND' value='12'/>
-      <enumerator name='DK_POP' value='13'/>
-    </enum-decl>
-    <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-186'>
+    <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-185'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='info_ordinary' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
+        <var-decl name='info_ordinary' type-id='type-id-186' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='info_macro' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
+        <var-decl name='info_macro' type-id='type-id-186' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='depth' type-id='type-id-13' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='270' column='1'/>
@@ -1902,15 +1885,15 @@ 
         <var-decl name='max_column_hint' type-id='type-id-13' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='283' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='reallocator' type-id='type-id-188' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
+        <var-decl name='reallocator' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='round_alloc_size' type-id='type-id-189' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
+        <var-decl name='round_alloc_size' type-id='type-id-188' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-187'>
+    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-186'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='maps' type-id='type-id-190' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
+        <var-decl name='maps' type-id='type-id-189' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='allocated' type-id='type-id-13' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='253' column='1'/>
@@ -1922,16 +1905,16 @@ 
         <var-decl name='cache' type-id='type-id-13' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='259' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='line_map_realloc' type-id='type-id-191' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-188'/>
-    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-192' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-189'/>
-    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-193'>
+    <typedef-decl name='line_map_realloc' type-id='type-id-190' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-187'/>
+    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-191' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-188'/>
+    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-192'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='LRK_MACRO_EXPANSION_POINT' value='0'/>
       <enumerator name='LRK_SPELLING_LOCATION' value='1'/>
       <enumerator name='LRK_MACRO_DEFINITION_LOCATION' value='2'/>
     </enum-decl>
-    <typedef-decl name='expanded_location' type-id='type-id-194' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-195'/>
-    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-195' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-194'>
+    <typedef-decl name='expanded_location' type-id='type-id-193' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-194'/>
+    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-194' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-193'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='file' type-id='type-id-15' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
       </data-member>
@@ -1945,11 +1928,11 @@ 
         <var-decl name='sysp' type-id='type-id-1' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='598' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-196'/>
-    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-190'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-197'/>
-    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-192'/>
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-191'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-195'/>
+    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-196'/>
+    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-191'/>
+    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-190'/>
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-128'/>
@@ -2148,18 +2131,18 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='type-id-51'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-198'>
+    <function-type size-in-bits='64' id='type-id-197'>
       <parameter type-id='type-id-32'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-199'>
+    <function-type size-in-bits='64' id='type-id-198'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-32'/>
       <return type-id='type-id-14'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/ggc-none.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-200'>
+    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-199'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='gt_ggc_e_24lazy_hex_fp_value_struct' value='0'/>
       <enumerator name='gt_ggc_e_15c_inline_static' value='1'/>
@@ -2837,13 +2820,13 @@ 
       <enumerator name='gt_e_P13libfunc_entry4htab' value='673'/>
       <enumerator name='gt_types_enum_last' value='674'/>
     </enum-decl>
-    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-201'>
+    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-200'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dummy' type-id='type-id-18' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
       </data-member>
     </class-decl>
     <function-decl name='ggc_alloc_typed_stat' mangled-name='_Z20ggc_alloc_typed_stat13gt_types_enumm' filepath='../.././gcc/ggc-none.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20ggc_alloc_typed_stat13gt_types_enumm'>
-      <parameter type-id='type-id-200' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
+      <parameter type-id='type-id-199' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <parameter type-id='type-id-32' name='size' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
@@ -2868,12 +2851,12 @@ 
       <parameter type-id='type-id-14'/>
       <return type-id='type-id-31'/>
     </function-decl>
-    <var-decl name='rtl_zone' type-id='type-id-201' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
-    <var-decl name='tree_zone' type-id='type-id-201' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
-    <var-decl name='tree_id_zone' type-id='type-id-201' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
+    <var-decl name='rtl_zone' type-id='type-id-200' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
+    <var-decl name='tree_zone' type-id='type-id-200' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
+    <var-decl name='tree_id_zone' type-id='type-id-200' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/input.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-202'>
+    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-201'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='num_ordinary_maps_allocated' type-id='type-id-21' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='687' column='1'/>
       </data-member>
@@ -2908,23 +2891,23 @@ 
         <var-decl name='duplicated_macro_maps_locations_size' type-id='type-id-21' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='697' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-203'/>
+    <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-202'/>
     <function-decl name='expand_location' mangled-name='_Z15expand_locationj' filepath='../.././gcc/input.c' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15expand_locationj'>
       <parameter type-id='type-id-103'/>
-      <return type-id='type-id-195'/>
+      <return type-id='type-id-194'/>
     </function-decl>
     <function-decl name='dump_line_table_statistics' mangled-name='_Z26dump_line_table_statisticsv' filepath='../.././gcc/input.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26dump_line_table_statisticsv'>
       <return type-id='type-id-31'/>
     </function-decl>
-    <var-decl name='line_table' type-id='type-id-197' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
+    <var-decl name='line_table' type-id='type-id-196' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
     <var-decl name='input_location' type-id='type-id-75' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/intl.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-204'/>
-    <typedef-decl name='nl_item' type-id='type-id-18' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-205'/>
-    <qualified-type-def type-id='type-id-204' const='yes' id='type-id-206'/>
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-208'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-203'/>
+    <typedef-decl name='nl_item' type-id='type-id-18' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-204'/>
+    <qualified-type-def type-id='type-id-203' const='yes' id='type-id-205'/>
+    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-206'/>
+    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-207'/>
     <function-decl name='gcc_init_libintl' mangled-name='_Z16gcc_init_libintlv' filepath='../.././gcc/intl.c' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16gcc_init_libintlv'>
       <return type-id='type-id-31'/>
     </function-decl>
@@ -2955,7 +2938,7 @@ 
       <return type-id='type-id-51'/>
     </function-decl>
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-205'/>
+      <parameter type-id='type-id-204'/>
       <return type-id='type-id-51'/>
     </function-decl>
     <function-decl name='strcasecmp' filepath='/usr/include/string.h' line='536' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2964,13 +2947,13 @@ 
       <return type-id='type-id-18'/>
     </function-decl>
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-207'/>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-32'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='wcswidth' filepath='/usr/include/wchar.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-207'/>
+      <parameter type-id='type-id-206'/>
       <parameter type-id='type-id-32'/>
       <return type-id='type-id-18'/>
     </function-decl>
@@ -2982,11 +2965,11 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/pretty-print.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <typedef-decl name='iconv_t' type-id='type-id-14' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-209'/>
-    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-210'/>
-    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-211'/>
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-212'/>
-    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
+    <typedef-decl name='iconv_t' type-id='type-id-14' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-208'/>
+    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-209'/>
+    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-210'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-211'/>
+    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-213'/>
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
       <parameter type-id='type-id-39' name='pp' filepath='../.././gcc/pretty-print.c' line='587' column='1'/>
       <parameter type-id='type-id-18' name='length' filepath='../.././gcc/pretty-print.c' line='587' column='1'/>
@@ -3024,7 +3007,7 @@ 
       <return type-id='type-id-31'/>
     </function-decl>
     <function-decl name='pp_base_last_position_in_text' mangled-name='_Z29pp_base_last_position_in_textPK17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29pp_base_last_position_in_textPK17pretty_print_info'>
-      <parameter type-id='type-id-211' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
+      <parameter type-id='type-id-210' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <function-decl name='pp_base_remaining_character_count_for_line' mangled-name='_Z42pp_base_remaining_character_count_for_lineP17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z42pp_base_remaining_character_count_for_lineP17pretty_print_info'>
@@ -3093,7 +3076,7 @@ 
       <parameter type-id='type-id-15'/>
       <return type-id='type-id-15'/>
     </function-decl>
-    <var-decl name='identifier_to_locale_alloc' type-id='type-id-214' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
+    <var-decl name='identifier_to_locale_alloc' type-id='type-id-213' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
     <var-decl name='identifier_to_locale_free' type-id='type-id-141' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <function-decl name='xstrerror' filepath='../.././gcc/../include/libiberty.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-18'/>
@@ -3112,43 +3095,43 @@ 
       <return type-id='type-id-18'/>
     </function-decl>
     <function-decl name='iconv' filepath='/usr/include/iconv.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-209'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-123'/>
-      <parameter type-id='type-id-212'/>
+      <parameter type-id='type-id-211'/>
       <parameter type-id='type-id-123'/>
-      <parameter type-id='type-id-212'/>
+      <parameter type-id='type-id-211'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='iconv_close' filepath='/usr/include/iconv.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-209'/>
+      <parameter type-id='type-id-208'/>
       <return type-id='type-id-18'/>
     </function-decl>
     <function-decl name='iconv_open' filepath='/usr/include/iconv.h' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-15'/>
-      <return type-id='type-id-209'/>
+      <return type-id='type-id-208'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-213'>
+    <function-type size-in-bits='64' id='type-id-212'>
       <parameter type-id='type-id-32'/>
       <return type-id='type-id-14'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/tlink.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-215'>
+    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-214'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='value' type-id='type-id-216' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
+        <var-decl name='value' type-id='type-id-215' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-217' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
+        <var-decl name='next' type-id='type-id-216' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='symbol' type-id='type-id-218' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-219'/>
-    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-218'>
+    <typedef-decl name='symbol' type-id='type-id-217' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-218'/>
+    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='key' type-id='type-id-15' visibility='default' filepath='../.././gcc/tlink.c' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='file' type-id='type-id-220' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
+        <var-decl name='file' type-id='type-id-219' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='chosen' type-id='type-id-18' visibility='default' filepath='../.././gcc/tlink.c' line='57' column='1'/>
@@ -3160,7 +3143,7 @@ 
         <var-decl name='tweaked' type-id='type-id-18' visibility='default' filepath='../.././gcc/tlink.c' line='59' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-221'>
+    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-220'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='key' type-id='type-id-15' visibility='default' filepath='../.././gcc/tlink.c' line='64' column='1'/>
       </data-member>
@@ -3177,38 +3160,38 @@ 
         <var-decl name='tweaking' type-id='type-id-18' visibility='default' filepath='../.././gcc/tlink.c' line='68' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-222'>
+    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='value' type-id='type-id-223' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
+        <var-decl name='value' type-id='type-id-222' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-224' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
+        <var-decl name='next' type-id='type-id-223' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='file' type-id='type-id-221' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-225'/>
-    <typedef-decl name='hashval_t' type-id='type-id-13' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-226'/>
-    <typedef-decl name='htab_t' type-id='type-id-227' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-228'/>
-    <typedef-decl name='htab_hash' type-id='type-id-229' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-230'/>
-    <typedef-decl name='htab_eq' type-id='type-id-231' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-232'/>
-    <typedef-decl name='htab_del' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-233'/>
-    <typedef-decl name='htab_alloc' type-id='type-id-234' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-235'/>
-    <typedef-decl name='htab_free' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-236'/>
-    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-237' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-238'/>
-    <typedef-decl name='htab_free_with_arg' type-id='type-id-239' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-240'/>
-    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-241'>
+    <typedef-decl name='file' type-id='type-id-220' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-224'/>
+    <typedef-decl name='hashval_t' type-id='type-id-13' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-225'/>
+    <typedef-decl name='htab_t' type-id='type-id-226' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-227'/>
+    <typedef-decl name='htab_hash' type-id='type-id-228' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-229'/>
+    <typedef-decl name='htab_eq' type-id='type-id-230' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-231'/>
+    <typedef-decl name='htab_del' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-232'/>
+    <typedef-decl name='htab_alloc' type-id='type-id-233' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-234'/>
+    <typedef-decl name='htab_free' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-235'/>
+    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-236' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-237'/>
+    <typedef-decl name='htab_free_with_arg' type-id='type-id-238' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-239'/>
+    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-240'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='NO_INSERT' value='0'/>
       <enumerator name='INSERT' value='1'/>
     </enum-decl>
-    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-242'>
+    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-241'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='hash_f' type-id='type-id-230' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
+        <var-decl name='hash_f' type-id='type-id-229' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='eq_f' type-id='type-id-232' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
+        <var-decl name='eq_f' type-id='type-id-231' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='del_f' type-id='type-id-233' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
+        <var-decl name='del_f' type-id='type-id-232' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='entries' type-id='type-id-100' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='111' column='1'/>
@@ -3229,53 +3212,53 @@ 
         <var-decl name='collisions' type-id='type-id-13' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='alloc_f' type-id='type-id-235' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
+        <var-decl name='alloc_f' type-id='type-id-234' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='free_f' type-id='type-id-236' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
+        <var-decl name='free_f' type-id='type-id-235' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='alloc_arg' type-id='type-id-14' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='alloc_with_arg_f' type-id='type-id-238' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
+        <var-decl name='alloc_with_arg_f' type-id='type-id-237' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='free_with_arg_f' type-id='type-id-240' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
+        <var-decl name='free_with_arg_f' type-id='type-id-239' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <var-decl name='size_prime_index' type-id='type-id-13' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='141' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-223'/>
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-220'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-224'/>
-    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-227'/>
-    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-231'/>
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-216'/>
-    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-217'/>
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-229'/>
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-239'/>
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-234'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-222'/>
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-219'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-226'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-230'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-215'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-216'/>
+    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-238'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-233'/>
+    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-236'/>
     <function-decl name='do_tlink' mangled-name='_Z8do_tlinkPPcS0_' filepath='../.././gcc/tlink.c' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8do_tlinkPPcS0_'>
       <parameter type-id='type-id-123'/>
       <parameter type-id='type-id-123'/>
       <return type-id='type-id-31'/>
     </function-decl>
     <var-decl name='symbol_stack_obstack' type-id='type-id-58' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
-    <var-decl name='symbol_stack' type-id='type-id-217' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
+    <var-decl name='symbol_stack' type-id='type-id-216' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
     <var-decl name='file_stack_obstack' type-id='type-id-58' mangled-name='file_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='201' column='1' elf-symbol-id='file_stack_obstack'/>
-    <var-decl name='file_stack' type-id='type-id-224' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
+    <var-decl name='file_stack' type-id='type-id-223' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
     <function-decl name='htab_hash_string' filepath='../.././gcc/../include/hashtab.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
-      <return type-id='type-id-226'/>
+      <return type-id='type-id-225'/>
     </function-decl>
     <function-decl name='htab_find_slot_with_hash' filepath='../.././gcc/../include/hashtab.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-226'/>
-      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-225'/>
+      <parameter type-id='type-id-240'/>
       <return type-id='type-id-100'/>
     </function-decl>
     <function-decl name='fscanf' filepath='/usr/include/stdio.h' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3303,10 +3286,10 @@ 
     </function-decl>
     <function-decl name='htab_create' filepath='../.././gcc/../include/hashtab.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-32'/>
-      <parameter type-id='type-id-230'/>
+      <parameter type-id='type-id-229'/>
+      <parameter type-id='type-id-231'/>
       <parameter type-id='type-id-232'/>
-      <parameter type-id='type-id-233'/>
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-227'/>
     </function-decl>
     <function-decl name='getpwd' filepath='../.././gcc/../include/libiberty.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-51'/>
@@ -3316,26 +3299,26 @@ 
       <parameter type-id='type-id-18'/>
       <return type-id='type-id-51'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-243'>
+    <function-type size-in-bits='64' id='type-id-242'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-14'/>
       <return type-id='type-id-18'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-244'>
+    <function-type size-in-bits='64' id='type-id-243'>
       <parameter type-id='type-id-14'/>
-      <return type-id='type-id-226'/>
+      <return type-id='type-id-225'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-245'>
+    <function-type size-in-bits='64' id='type-id-244'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-14'/>
       <return type-id='type-id-31'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-246'>
+    <function-type size-in-bits='64' id='type-id-245'>
       <parameter type-id='type-id-32'/>
       <parameter type-id='type-id-32'/>
       <return type-id='type-id-14'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-247'>
+    <function-type size-in-bits='64' id='type-id-246'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-32'/>
       <parameter type-id='type-id-32'/>
@@ -3434,140 +3417,140 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='248' id='type-id-248'>
-      <subrange length='31' type-id='type-id-4' id='type-id-249'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='248' id='type-id-247'>
+      <subrange length='31' type-id='type-id-4' id='type-id-248'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='48' id='type-id-250'>
-      <subrange length='6' type-id='type-id-4' id='type-id-251'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='48' id='type-id-249'>
+      <subrange length='6' type-id='type-id-4' id='type-id-250'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-252'>
-      <subrange length='7' type-id='type-id-4' id='type-id-253'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-251'>
+      <subrange length='7' type-id='type-id-4' id='type-id-252'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='248' id='type-id-254'>
-      <subrange length='31' type-id='type-id-4' id='type-id-249'/>
+    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='248' id='type-id-253'>
+      <subrange length='31' type-id='type-id-4' id='type-id-248'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='48' id='type-id-255'>
-      <subrange length='6' type-id='type-id-4' id='type-id-251'/>
+    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='48' id='type-id-254'>
+      <subrange length='6' type-id='type-id-4' id='type-id-250'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='56' id='type-id-256'>
-      <subrange length='7' type-id='type-id-4' id='type-id-253'/>
+    <array-type-def dimensions='1' type-id='type-id-125' size-in-bits='56' id='type-id-255'>
+      <subrange length='7' type-id='type-id-4' id='type-id-252'/>
     </array-type-def>
-    <var-decl name='version_string' type-id='type-id-255' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
-    <var-decl name='pkgversion_string' type-id='type-id-256' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
-    <var-decl name='bug_report_url' type-id='type-id-254' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
+    <var-decl name='version_string' type-id='type-id-254' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
+    <var-decl name='pkgversion_string' type-id='type-id-255' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
+    <var-decl name='bug_report_url' type-id='type-id-253' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/charset.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
     <function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <return type-id='type-id-31'/>
     </function-decl>
     <function-decl name='_cpp_destroy_iconv' mangled-name='_cpp_destroy_iconv' filepath='../.././libcpp/charset.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_iconv'>
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <return type-id='type-id-31'/>
     </function-decl>
     <function-decl name='cpp_host_to_exec_charset' mangled-name='_Z24cpp_host_to_exec_charsetP10cpp_readerj' filepath='../.././libcpp/charset.c' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_host_to_exec_charsetP10cpp_readerj'>
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
-      <parameter type-id='type-id-260' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
-      <return type-id='type-id-260'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-259' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <function-decl name='_cpp_valid_ucn' mangled-name='_cpp_valid_ucn' filepath='../.././libcpp/charset.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_valid_ucn'>
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
-      <parameter type-id='type-id-258' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
-      <parameter type-id='type-id-257' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-257' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-256' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <parameter type-id='type-id-18' name='identifier_pos' filepath='../.././libcpp/charset.c' line='984' column='1'/>
-      <parameter type-id='type-id-261' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
-      <return type-id='type-id-260'/>
+      <parameter type-id='type-id-260' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <function-decl name='cpp_interpret_string' mangled-name='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
-      <parameter type-id='type-id-259'/>
-      <parameter type-id='type-id-262'/>
+      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-261'/>
       <parameter type-id='type-id-32'/>
-      <parameter type-id='type-id-263'/>
+      <parameter type-id='type-id-262'/>
       <parameter type-id='type-id-181'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_interpret_string_notranslate' mangled-name='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
-      <parameter type-id='type-id-259'/>
-      <parameter type-id='type-id-262'/>
+      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-261'/>
       <parameter type-id='type-id-32'/>
-      <parameter type-id='type-id-263'/>
+      <parameter type-id='type-id-262'/>
       <parameter type-id='type-id-181'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_interpret_charconst' mangled-name='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi' filepath='../.././libcpp/charset.c' line='1602' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi'>
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-263'/>
       <parameter type-id='type-id-264'/>
-      <parameter type-id='type-id-265'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-260'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <function-decl name='_cpp_interpret_identifier' mangled-name='_cpp_interpret_identifier' filepath='../.././libcpp/charset.c' line='1634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_interpret_identifier'>
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
-      <parameter type-id='type-id-257' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-256' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <parameter type-id='type-id-32' name='len' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='_cpp_convert_input' mangled-name='_cpp_convert_input' filepath='../.././libcpp/charset.c' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_convert_input'>
-      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
+      <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <parameter type-id='type-id-15' name='input_charset' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
-      <parameter type-id='type-id-266' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
+      <parameter type-id='type-id-265' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <parameter type-id='type-id-32' name='size' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <parameter type-id='type-id-32' name='len' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
-      <parameter type-id='type-id-267' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
-      <parameter type-id='type-id-268' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
-      <return type-id='type-id-266'/>
+      <parameter type-id='type-id-266' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-267' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <return type-id='type-id-265'/>
     </function-decl>
     <function-decl name='_cpp_default_encoding' mangled-name='_cpp_default_encoding' filepath='../.././libcpp/charset.c' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_default_encoding'>
       <return type-id='type-id-15'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-262'/>
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-264'/>
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-267'/>
-    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-259'/>
-    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-263'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-261'/>
-    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-268'/>
-    <typedef-decl name='cppchar_t' type-id='type-id-13' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-260'/>
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-265'/>
-    <qualified-type-def type-id='type-id-273' const='yes' id='type-id-269'/>
-    <qualified-type-def type-id='type-id-277' const='yes' id='type-id-270'/>
-    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-271'/>
-    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-274'>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-256'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-260'/>
+    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-267'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-13' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-259'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-264'/>
+    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-268'/>
+    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-269'/>
+    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-270'/>
+    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='previous' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='prev_class' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='711' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='level' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_reader' type-id='type-id-279' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-272'/>
-    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-273'/>
-    <typedef-decl name='off_t' type-id='type-id-54' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-275'/>
-    <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-276'/>
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-278'>
+    <typedef-decl name='cpp_reader' type-id='type-id-278' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-271'/>
+    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
+    <typedef-decl name='off_t' type-id='type-id-54' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-274'/>
+    <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-275'/>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-277'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
       <enumerator name='normalized_identifier_C' value='2'/>
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
-    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-279'>
+    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-278'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-280'>
+        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-279'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='base' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='limit' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='cur' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <var-decl name='first_line' type-id='type-id-103' visibility='default' filepath='../.././libcpp/internal.h' line='532' column='1'/>
@@ -3575,40 +3558,40 @@ 
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='buffer' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overlaid_buffer' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='state' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='line_table' type-id='type-id-197' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-196' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='directive_line' type-id='type-id-103' visibility='default' filepath='../.././libcpp/internal.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a_buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='u_buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='free_buffs' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='base_context' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='context' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='directive' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='directive_result' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <var-decl name='invocation_location' type-id='type-id-103' visibility='default' filepath='../.././libcpp/internal.h' line='414' column='1'/>
@@ -3617,31 +3600,31 @@ 
         <var-decl name='set_invocation_location' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='418' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='quote_include' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='bracket_include' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='no_search_path' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='all_files' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='main_file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='dir_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='file_hash_entries' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='nonexistent_file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-226' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <var-decl name='nonexistent_file_ob' type-id='type-id-58' visibility='default' filepath='../.././libcpp/internal.h' line='437' column='1'/>
@@ -3653,10 +3636,10 @@ 
         <var-decl name='seen_once_only' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='mi_cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='mi_ind_cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <var-decl name='mi_valid' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='450' column='1'/>
@@ -3665,10 +3648,10 @@ 
         <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='base_run' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='cur_run' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='lookaheads' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='455' column='1'/>
@@ -3677,25 +3660,25 @@ 
         <var-decl name='keep_tokens' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='458' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='macro_buffer' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <var-decl name='macro_buffer_len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='narrow_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='utf8_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='char16_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='char32_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='wide_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <var-decl name='date' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
@@ -3704,13 +3687,13 @@ 
         <var-decl name='time' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='avoid_paste' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='eof' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
-        <var-decl name='deps' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <var-decl name='hash_ob' type-id='type-id-58' visibility='default' filepath='../.././libcpp/internal.h' line='497' column='1'/>
@@ -3719,31 +3702,31 @@ 
         <var-decl name='buffer_ob' type-id='type-id-58' visibility='default' filepath='../.././libcpp/internal.h' line='501' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='pragmas' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
-        <var-decl name='cb' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
-        <var-decl name='hash_table' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='op_stack' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='op_limit' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
-        <var-decl name='opts' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
-        <var-decl name='spec_nodes' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <var-decl name='our_hashtable' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='524' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='out' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <var-decl name='saved_cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
@@ -3755,107 +3738,107 @@ 
         <var-decl name='saved_line_base' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='savedstate' type-id='type-id-303' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <var-decl name='counter' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='543' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='comments' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-303' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
-        <var-decl name='pushed_macros' type-id='type-id-305' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <var-decl name='forced_token_location_p' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='553' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-277'/>
-    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-284'/>
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-292'/>
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-287'/>
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-282'/>
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-288'/>
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-303'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-291'/>
+    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-276'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-283'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-289'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-298'/>
     <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-297'/>
-    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-298'>
+    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-296'/>
+    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='line_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='file_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dir_change' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='include' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='define' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='undef' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ident' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='def_pragma' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='valid_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='read_pch' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='missing_header' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='macro_to_expand' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='error' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='used_define' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='used_undef' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='before_define' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='used' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='user_builtin_macro' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-285'>
+    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-284'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-332'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-331'>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-333'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-332'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='first' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='last' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-335'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-334'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
               </data-member>
@@ -3865,17 +3848,17 @@ 
             </class-decl>
           </member-type>
           <data-member access='private'>
-            <var-decl name='iso' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='trad' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-336'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-335'>
           <data-member access='private'>
-            <var-decl name='mc' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='macro' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='218' column='1'/>
@@ -3883,27 +3866,27 @@ 
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='u' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='buff' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='c' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tokens_kind' type-id='type-id-338' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-289'>
+    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-288'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-288' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-287' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-51' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='559' column='1'/>
@@ -3921,23 +3904,23 @@ 
         <var-decl name='canonical_name' type-id='type-id-51' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='571' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='name_map' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='construct' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ino' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='dev' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-301'>
+    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-300'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-343'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-342'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='style' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='missing_files' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='456' column='1'/>
@@ -3957,7 +3940,7 @@ 
         <var-decl name='tabstop' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lang' type-id='type-id-345' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cplusplus' type-id='type-id-27' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='299' column='1'/>
@@ -4083,7 +4066,7 @@ 
         <var-decl name='input_charset' type-id='type-id-15' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='warn_normalize' type-id='type-id-278' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-277' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <var-decl name='warn_invalid_pch' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='444' column='1'/>
@@ -4092,7 +4075,7 @@ 
         <var-decl name='restore_pch_deps' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='deps' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='precision' type-id='type-id-32' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='474' column='1'/>
@@ -4122,18 +4105,18 @@ 
         <var-decl name='directives_only' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='487' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-295'>
+    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='func' type-id='type-id-346' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cd' type-id='type-id-209' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-208' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='width' type-id='type-id-18' visibility='default' filepath='../.././libcpp/internal.h' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-283'>
+    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-282'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='in_directive' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
       </data-member>
@@ -4177,7 +4160,7 @@ 
         <var-decl name='pragma_allow_expansion' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='271' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-302'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-301'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='n_defined' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
       </data-member>
@@ -4191,18 +4174,18 @@ 
         <var-decl name='n__VA_ARGS__' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='280' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-294'/>
-    <typedef-decl name='cpp_comment_table' type-id='type-id-348' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-304'/>
-    <typedef-decl name='tokenrun' type-id='type-id-347' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-331'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-340'/>
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-293'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-347' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-303'/>
+    <typedef-decl name='tokenrun' type-id='type-id-346' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-292'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-280'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-338'/>
+    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-307'/>
     <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
-    <qualified-type-def type-id='type-id-353' const='yes' id='type-id-309'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-328'/>
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-345'>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-327'/>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-344'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -4217,35 +4200,35 @@ 
       <enumerator name='CLK_CXX11' value='10'/>
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-338'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-337'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-344'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-343'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-325'/>
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-337'/>
-    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-306'>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-324'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-336'/>
+    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-305'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='base' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cur' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='limit' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-307'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-306'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-15' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
       </data-member>
@@ -4259,19 +4242,19 @@ 
         <var-decl name='dir_name' type-id='type-id-15' visibility='default' filepath='../.././libcpp/files.c' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='next_file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='buffer' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='buffer_start' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-256' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='cmacro' type-id='type-id-292' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-291' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='dir' type-id='type-id-288' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-287' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='st' type-id='type-id-62' visibility='default' filepath='../.././libcpp/files.c' line='90' column='1'/>
@@ -4298,7 +4281,7 @@ 
         <var-decl name='buffer_valid' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='112' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-310'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-309'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
       </data-member>
@@ -4315,7 +4298,7 @@ 
         <var-decl name='rlimit' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='notes' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='cur_note' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='307' column='1'/>
@@ -4327,16 +4310,16 @@ 
         <var-decl name='notes_cap' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='prev' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='file' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='timestamp' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='if_stack' type-id='type-id-358' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='need_line' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='326' column='1'/>
@@ -4354,22 +4337,22 @@ 
         <var-decl name='sysp' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='346' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='dir' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='input_cset_desc' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-311'/>
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-312'>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-310'/>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-311'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-305' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-51' visibility='default' filepath='../.././libcpp/internal.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='definition' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='line' type-id='type-id-103' visibility='default' filepath='../.././libcpp/internal.h' line='367' column='1'/>
@@ -4384,9 +4367,9 @@ 
         <var-decl name='is_undef' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='374' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-313'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='targetv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='ntargets' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='33' column='1'/>
@@ -4395,7 +4378,7 @@ 
         <var-decl name='targets_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='depv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='ndeps' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='37' column='1'/>
@@ -4404,10 +4387,10 @@ 
         <var-decl name='deps_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='vpathv' type-id='type-id-339' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='vpathlv' type-id='type-id-212' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-211' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='nvpaths' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='42' column='1'/>
@@ -4416,19 +4399,19 @@ 
         <var-decl name='vpaths_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='43' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-314'/>
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-315'>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-313'/>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-314'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='stack' type-id='type-id-58' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='entries' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='alloc_node' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='alloc_subobject' type-id='type-id-214' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-213' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='nslots' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/symtab.h' line='59' column='1'/>
@@ -4437,7 +4420,7 @@ 
         <var-decl name='nelements' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/symtab.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pfile' type-id='type-id-259' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-258' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='searches' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/symtab.h' line='66' column='1'/>
@@ -4449,12 +4432,12 @@ 
         <var-decl name='entries_owned' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/symtab.h' line='70' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-316'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-315'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='token' type-id='type-id-264' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='value' type-id='type-id-361' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-360' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='loc' type-id='type-id-103' visibility='default' filepath='../.././libcpp/expr.c' line='34' column='1'/>
@@ -4463,13 +4446,13 @@ 
         <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-317'/>
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-347'>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-316'/>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-346'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
@@ -4478,9 +4461,9 @@ 
         <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-348'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entries' type-id='type-id-362' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-18' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='977' column='1'/>
@@ -4489,45 +4472,45 @@ 
         <var-decl name='allocated' type-id='type-id-18' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='980' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='convert_f' type-id='type-id-363' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-346'/>
-    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-342'/>
-    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-341'/>
-    <typedef-decl name='missing_header_cb' type-id='type-id-364' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-327'/>
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-334'>
+    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-345'/>
+    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-341'/>
+    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-340'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-326'/>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-333'>
       <data-member access='private'>
-        <var-decl name='token' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ptoken' type-id='type-id-365' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-364' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-320'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-317'/>
     <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-319'/>
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-324'/>
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-320'/>
     <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
-    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-322'/>
-    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-357'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
     <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-364'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-365'/>
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-362'/>
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-359'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-358'/>
-    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-353'/>
-    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-352'/>
-    <typedef-decl name='cpp_num' type-id='type-id-381' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-361'/>
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-360'/>
-    <typedef-decl name='macro_context' type-id='type-id-383' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-356'/>
-    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-381'>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-364'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-357'/>
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-352'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-351'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-359'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-355'/>
+    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='high' type-id='type-id-384' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='low' type-id='type-id-384' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='unsignedp' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='805' column='1'/>
@@ -4536,8 +4519,8 @@ 
         <var-decl name='overflow' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='806' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-380'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-383'>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-379'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='macro_node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
       </data-member>
@@ -4548,11 +4531,11 @@ 
         <var-decl name='cur_virt_loc' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='157' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='_cpp_line_note' type-id='type-id-385' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-375'/>
-    <typedef-decl name='cpp_comment' type-id='type-id-386' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-378'/>
-    <typedef-decl name='hashnode' type-id='type-id-387' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-379'/>
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-387'/>
-    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-385'>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-374'/>
+    <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
+    <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
+    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pos' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
       </data-member>
@@ -4560,7 +4543,7 @@ 
         <var-decl name='type' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='293' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anon