diff mbox series

[1/2] Use flat representation to canonicalize anonymous classes and unions

Message ID 87bliftjxy.fsf@redhat.com
State New
Headers show
Series [1/2] Use flat representation to canonicalize anonymous classes and unions | expand

Commit Message

Dodji Seketeli Sept. 9, 2020, 8:48 a.m. UTC
Hello,

This patch is the first of a series of two which intends to improve the
situation of type equality involving anonymous types.

During the canonicalization of a type T, the algorithm uses the pretty
representation of T to limit the number of types to compare T to.
That pretty representation is based on the type name.

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

To fix that, this change makes the pretty representation of anonymous
classes (and unions) use their flat representation.

For the record, the flat representation of an anonymous struct with a
an integer and a char data members is the string:

            'struct {int i; char c;}'

	* src/abg-ir.cc ({class, union}_decl::get_pretty_representation):
	Use the flat representation of the class or union.
	* tests/data/test-annotate/libtest23.so.abi: Adjust.
	* tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt: Likewise.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt: Likewise.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt: Likewise.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt: Likewise.
	* tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt: Likewise.
	* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt: Likewise.
	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
	* tests/data/test-read-dwarf/libtest23.so.abi: Likewise.
	* tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 src/abg-ir.cc                                      |   17 +-
 tests/data/test-annotate/libtest23.so.abi          |  158 +--
 .../PR25058-liblttng-ctl-report-1.txt              |    9 +-
 .../test30-pr18904-rvalueref-report0.txt           |    6 +-
 .../test30-pr18904-rvalueref-report1.txt           |    6 +-
 .../test30-pr18904-rvalueref-report2.txt           |    6 +-
 .../test35-pr18754-no-added-syms-report-0.txt      |    6 +-
 ...-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt |    2 +-
 tests/data/test-read-dwarf/PR25007-sdhci.ko.abi    |  617 ---------
 tests/data/test-read-dwarf/libtest23.so.abi        |  156 +--
 tests/data/test-read-dwarf/test11-pr18828.so.abi   | 1458 ++++++++++----------
 11 files changed, 902 insertions(+), 1539 deletions(-)

Comments

Giuliano Procida Sept. 9, 2020, 10:23 a.m. UTC | #1
Hi Dodji.

On Wed, 9 Sep 2020 at 09:48, Dodji Seketeli <dodji@redhat.com> wrote:

> Hello,
>
> This patch is the first of a series of two which intends to improve the
> situation of type equality involving anonymous types.
>
> During the canonicalization of a type T, the algorithm uses the pretty
> representation of T to limit the number of types to compare T to.
> That pretty representation is based on the type name.
>
> For anonymous types, the type name is not unique; it's constructed
> just for internal purposes.  So using that in the pretty
> representation might negatively impact the accuracy of the
> canonicalization; it might make it so that two types might wrongly be
> considered canonicaly different.
>
> To fix that, this change makes the pretty representation of anonymous
> classes (and unions) use their flat representation.
>

It's not totally clear from the commit message whether the external or
internal pretty name is being discussed in places. It's the internal pretty
name that has changed to match the external one.


>
> For the record, the flat representation of an anonymous struct with a
> an integer and a char data members is the string:
>
>             'struct {int i; char c;}'
>
>
This is particularly good with --type-id-style hash as this string is going
to be a lot more stable than '__anonymous_union__2'. I think it's a big win
for reducing churn in kernel ABI monitoring.


>         * src/abg-ir.cc ({class, union}_decl::get_pretty_representation):
>         Use the flat representation of the class or union.
>         * tests/data/test-annotate/libtest23.so.abi: Adjust.
>         * tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt:
> Likewise.
>         *
> tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt: Likewise.
>         *
> tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt: Likewise.
>         *
> tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt: Likewise.
>         *
> tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt:
> Likewise.
>         *
> tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt:
> Likewise.
>         * tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
>         * tests/data/test-read-dwarf/libtest23.so.abi: Likewise.
>         * tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise.
>
> Signed-off-by: Dodji Seketeli <dodji@redhat.com>
>

Signed-off-by: Giuliano Procida <gprocida@google.com>

Regards,
Giuliano.


> ---
>  src/abg-ir.cc                                      |   17 +-
>  tests/data/test-annotate/libtest23.so.abi          |  158 +--
>  .../PR25058-liblttng-ctl-report-1.txt              |    9 +-
>  .../test30-pr18904-rvalueref-report0.txt           |    6 +-
>  .../test30-pr18904-rvalueref-report1.txt           |    6 +-
>  .../test30-pr18904-rvalueref-report2.txt           |    6 +-
>  .../test35-pr18754-no-added-syms-report-0.txt      |    6 +-
>  ...-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt |    2 +-
>  tests/data/test-read-dwarf/PR25007-sdhci.ko.abi    |  617 ---------
>  tests/data/test-read-dwarf/libtest23.so.abi        |  156 +--
>  tests/data/test-read-dwarf/test11-pr18828.so.abi   | 1458
> ++++++++++----------
>  11 files changed, 902 insertions(+), 1539 deletions(-)
>
> diff --git a/src/abg-ir.cc b/src/abg-ir.cc
> index 358a7a2..d98d4bd 100644
> --- a/src/abg-ir.cc
> +++ b/src/abg-ir.cc
> @@ -19960,20 +19960,7 @@ class_decl::get_pretty_representation(bool
> internal,
>    // if an anonymous class is named by a typedef, then consider that
>    // it has a name, which is the typedef name.
>    if (get_is_anonymous())
> -    {
> -      if (internal)
> -       {
> -         if (typedef_decl_sptr d = get_naming_typedef())
> -           {
> -             string qualified_name =
> -               decl_base::priv_->qualified_parent_name_ + "::" +
> d->get_name();
> -             return cl + qualified_name;
> -           }
> -       }
> -      else
> -       return get_class_or_union_flat_representation(this, "",
> -                                                     /*one_line=*/true);
> -    }
> +    return get_class_or_union_flat_representation(this,
> "",/*one_line=*/true);
>
>    string result = cl;
>    if (qualified_name)
> @@ -21745,7 +21732,7 @@ union_decl::get_pretty_representation(bool
> internal,
>                                       bool qualified_name) const
>  {
>    string repr;
> -  if (get_is_anonymous() && !internal)
> +  if (get_is_anonymous())
>      repr = get_class_or_union_flat_representation(this, "",
>                                                   /*one_line=*/true);
>    else
> diff --git a/tests/data/test-annotate/libtest23.so.abi
> b/tests/data/test-annotate/libtest23.so.abi
> index 5001d02..2019be1 100644
> --- a/tests/data/test-annotate/libtest23.so.abi
> +++ b/tests/data/test-annotate/libtest23.so.abi
> @@ -20,45 +20,45 @@
>      <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
>      <!-- char -->
>      <type-decl name='char' size-in-bits='8' id='type-id-2'/>
> -    <!-- struct {} -->
> -    <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' id='type-id-3'/>
>      <!-- struct typedef __va_list_tag __va_list_tag -->
> -    <class-decl name='typedef __va_list_tag __va_list_tag'
> size-in-bits='192' is-struct='yes' visibility='default' id='type-id-4'>
> +    <class-decl name='typedef __va_list_tag __va_list_tag'
> size-in-bits='192' is-struct='yes' visibility='default' id='type-id-3'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- unsigned int typedef __va_list_tag __va_list_tag::gp_offset
> -->
> -        <var-decl name='gp_offset' type-id='type-id-5'
> visibility='default'/>
> +        <var-decl name='gp_offset' type-id='type-id-4'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <!-- unsigned int typedef __va_list_tag __va_list_tag::fp_offset
> -->
> -        <var-decl name='fp_offset' type-id='type-id-5'
> visibility='default'/>
> +        <var-decl name='fp_offset' type-id='type-id-4'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- void* typedef __va_list_tag __va_list_tag::overflow_arg_area
> -->
> -        <var-decl name='overflow_arg_area' type-id='type-id-6'
> visibility='default'/>
> +        <var-decl name='overflow_arg_area' type-id='type-id-5'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- void* typedef __va_list_tag __va_list_tag::reg_save_area -->
> -        <var-decl name='reg_save_area' type-id='type-id-6'
> visibility='default'/>
> +        <var-decl name='reg_save_area' type-id='type-id-5'
> visibility='default'/>
>        </data-member>
>      </class-decl>
>      <!-- double -->
> -    <type-decl name='double' size-in-bits='64' id='type-id-7'/>
> +    <type-decl name='double' size-in-bits='64' id='type-id-6'/>
>      <!-- float -->
> -    <type-decl name='float' size-in-bits='32' id='type-id-8'/>
> +    <type-decl name='float' size-in-bits='32' id='type-id-7'/>
>      <!-- int -->
> -    <type-decl name='int' size-in-bits='32' id='type-id-9'/>
> +    <type-decl name='int' size-in-bits='32' id='type-id-8'/>
>      <!-- long double -->
> -    <type-decl name='long double' size-in-bits='128' id='type-id-10'/>
> +    <type-decl name='long double' size-in-bits='128' id='type-id-9'/>
>      <!-- long int -->
> -    <type-decl name='long int' size-in-bits='64' id='type-id-11'/>
> +    <type-decl name='long int' size-in-bits='64' id='type-id-10'/>
>      <!-- long long int -->
> -    <type-decl name='long long int' size-in-bits='64' id='type-id-12'/>
> +    <type-decl name='long long int' size-in-bits='64' id='type-id-11'/>
>      <!-- long long unsigned int -->
> -    <type-decl name='long long unsigned int' size-in-bits='64'
> id='type-id-13'/>
> +    <type-decl name='long long unsigned int' size-in-bits='64'
> id='type-id-12'/>
>      <!-- short int -->
> -    <type-decl name='short int' size-in-bits='16' id='type-id-14'/>
> +    <type-decl name='short int' size-in-bits='16' id='type-id-13'/>
> +    <!-- struct {} -->
> +    <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' id='type-id-14'/>
>      <!-- unsigned int -->
> -    <type-decl name='unsigned int' size-in-bits='32' id='type-id-5'/>
> +    <type-decl name='unsigned int' size-in-bits='32' id='type-id-4'/>
>      <!-- unsigned long int -->
>      <type-decl name='unsigned long int' size-in-bits='64'
> id='type-id-15'/>
>      <!-- unsigned long int[] -->
> @@ -71,7 +71,7 @@
>      <!-- wchar_t -->
>      <type-decl name='wchar_t' size-in-bits='32' id='type-id-19'/>
>      <!-- typedef unsigned int wint_t -->
> -    <typedef-decl name='wint_t' type-id='type-id-5'
> filepath='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stddef.h'
> line='353' column='1' id='type-id-20'/>
> +    <typedef-decl name='wint_t' type-id='type-id-4'
> filepath='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stddef.h'
> line='353' column='1' id='type-id-20'/>
>      <!-- typedef _IO_FILE __FILE -->
>      <typedef-decl name='__FILE' type-id='type-id-21'
> filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-22'/>
>      <!-- typedef unsigned long int size_t -->
> @@ -88,7 +88,7 @@
>        </member-type>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- int __count -->
> -        <var-decl name='__count' type-id='type-id-9' visibility='default'
> filepath='/usr/include/wchar.h' line='84' column='1'/>
> +        <var-decl name='__count' type-id='type-id-8' visibility='default'
> filepath='/usr/include/wchar.h' line='84' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <!-- union {} __value -->
> @@ -99,43 +99,43 @@
>      <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-28'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- int tm::tm_sec -->
> -        <var-decl name='tm_sec' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='135' column='1'/>
> +        <var-decl name='tm_sec' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='135' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <!-- int tm::tm_min -->
> -        <var-decl name='tm_min' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='136' column='1'/>
> +        <var-decl name='tm_min' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='136' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int tm::tm_hour -->
> -        <var-decl name='tm_hour' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='137' column='1'/>
> +        <var-decl name='tm_hour' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='137' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
>          <!-- int tm::tm_mday -->
> -        <var-decl name='tm_mday' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='138' column='1'/>
> +        <var-decl name='tm_mday' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='138' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- int tm::tm_mon -->
> -        <var-decl name='tm_mon' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='139' column='1'/>
> +        <var-decl name='tm_mon' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='139' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='160'>
>          <!-- int tm::tm_year -->
> -        <var-decl name='tm_year' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='140' column='1'/>
> +        <var-decl name='tm_year' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='140' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <!-- int tm::tm_wday -->
> -        <var-decl name='tm_wday' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='141' column='1'/>
> +        <var-decl name='tm_wday' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='141' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='224'>
>          <!-- int tm::tm_yday -->
> -        <var-decl name='tm_yday' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='142' column='1'/>
> +        <var-decl name='tm_yday' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='142' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <!-- int tm::tm_isdst -->
> -        <var-decl name='tm_isdst' type-id='type-id-9'
> visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
> +        <var-decl name='tm_isdst' type-id='type-id-8'
> visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <!-- long int tm::tm_gmtoff -->
> -        <var-decl name='tm_gmtoff' type-id='type-id-11'
> visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
> +        <var-decl name='tm_gmtoff' type-id='type-id-10'
> visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <!-- const char* tm::tm_zone -->
> @@ -147,11 +147,11 @@
>      <!-- typedef const __int32_t* wctrans_t -->
>      <typedef-decl name='wctrans_t' type-id='type-id-31'
> filepath='/usr/include/wctype.h' line='186' column='1' id='type-id-32'/>
>      <!-- typedef int __int32_t -->
> -    <typedef-decl name='__int32_t' type-id='type-id-9'
> filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-33'/>
> +    <typedef-decl name='__int32_t' type-id='type-id-8'
> filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-33'/>
>      <!-- __FILE* -->
>      <pointer-type-def type-id='type-id-22' size-in-bits='64'
> id='type-id-34'/>
>      <!-- __anonymous_struct__1* -->
> -    <pointer-type-def type-id='type-id-3' size-in-bits='64'
> id='type-id-35'/>
> +    <pointer-type-def type-id='type-id-14' size-in-bits='64'
> id='type-id-35'/>
>      <!-- char& -->
>      <reference-type-def kind='lvalue' type-id='type-id-2'
> size-in-bits='64' id='type-id-36'/>
>      <!-- char* -->
> @@ -175,15 +175,15 @@
>      <!-- const char** -->
>      <pointer-type-def type-id='type-id-29' size-in-bits='64'
> id='type-id-45'/>
>      <!-- const int -->
> -    <qualified-type-def type-id='type-id-9' const='yes' id='type-id-46'/>
> +    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-46'/>
>      <!-- const long int -->
> -    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-47'/>
> +    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-47'/>
>      <!-- const mbstate_t -->
>      <qualified-type-def type-id='type-id-25' const='yes' id='type-id-48'/>
>      <!-- const mbstate_t* -->
>      <pointer-type-def type-id='type-id-48' size-in-bits='64'
> id='type-id-49'/>
>      <!-- const short int -->
> -    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-50'/>
> +    <qualified-type-def type-id='type-id-13' const='yes' id='type-id-50'/>
>      <!-- const std::basic_string<char, std::char_traits<char>,
> std::allocator<char> > -->
>      <qualified-type-def type-id='type-id-51' const='yes' id='type-id-52'/>
>      <!-- const std::basic_string<char, std::char_traits<char>,
> std::allocator<char> >& -->
> @@ -221,9 +221,9 @@
>      <!-- std::string& -->
>      <reference-type-def kind='lvalue' type-id='type-id-72'
> size-in-bits='64' id='type-id-70'/>
>      <!-- typedef __va_list_tag __va_list_tag* -->
> -    <pointer-type-def type-id='type-id-4' size-in-bits='64'
> id='type-id-73'/>
> +    <pointer-type-def type-id='type-id-3' size-in-bits='64'
> id='type-id-73'/>
>      <!-- void* -->
> -    <pointer-type-def type-id='type-id-18' size-in-bits='64'
> id='type-id-6'/>
> +    <pointer-type-def type-id='type-id-18' size-in-bits='64'
> id='type-id-5'/>
>      <!-- wchar_t* -->
>      <pointer-type-def type-id='type-id-19' size-in-bits='64'
> id='type-id-74'/>
>      <!-- wchar_t** -->
> @@ -334,7 +334,7 @@
>      <!-- wint_t btowc(int) -->
>      <function-decl name='btowc' filepath='/usr/include/wchar.h'
> line='353' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- typedef wint_t -->
>        <return type-id='type-id-20'/>
>      </function-decl>
> @@ -350,7 +350,7 @@
>        <!-- parameter of type 'wchar_t*' -->
>        <parameter type-id='type-id-74'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type '__FILE*' -->
>        <parameter type-id='type-id-34'/>
>        <!-- wchar_t* -->
> @@ -372,16 +372,16 @@
>        <!-- parameter of type '__FILE*' -->
>        <parameter type-id='type-id-34'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int fwide(__FILE*, int) -->
>      <function-decl name='fwide' filepath='/usr/include/wchar.h'
> line='587' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type '__FILE*' -->
>        <parameter type-id='type-id-34'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int fwprintf(__FILE*, const wchar_t*, ...) -->
>      <function-decl name='fwprintf' filepath='/usr/include/wchar.h'
> line='594' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -391,7 +391,7 @@
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int fwscanf(__FILE*, const wchar_t*, ...) -->
>      <function-decl name='fwscanf' filepath='/usr/include/wchar.h'
> line='635' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -401,7 +401,7 @@
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- wint_t getwc(__FILE*) -->
>      <function-decl name='getwc' filepath='/usr/include/wchar.h'
> line='746' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -444,7 +444,7 @@
>        <!-- parameter of type 'const mbstate_t*' -->
>        <parameter type-id='type-id-49'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- size_t mbsrtowcs(wchar_t*, const char**, size_t, mbstate_t*) -->
>      <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h'
> line='408' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -485,7 +485,7 @@
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int swscanf(const wchar_t*, const wchar_t*, ...) -->
>      <function-decl name='swscanf' filepath='/usr/include/wchar.h'
> line='645' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -495,7 +495,7 @@
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- wint_t ungetwc(wint_t, __FILE*) -->
>      <function-decl name='ungetwc' filepath='/usr/include/wchar.h'
> line='789' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -515,7 +515,7 @@
>        <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
>        <parameter type-id='type-id-73'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int vfwscanf(__FILE*, const wchar_t*, typedef __va_list_tag
> __va_list_tag*) -->
>      <function-decl name='vfwscanf' filepath='/usr/include/wchar.h'
> line='689' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -526,7 +526,7 @@
>        <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
>        <parameter type-id='type-id-73'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int vswprintf(wchar_t*, size_t, const wchar_t*, typedef
> __va_list_tag __va_list_tag*) -->
>      <function-decl name='vswprintf' filepath='/usr/include/wchar.h'
> line='625' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -539,7 +539,7 @@
>        <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
>        <parameter type-id='type-id-73'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int vswscanf(const wchar_t*, const wchar_t*, typedef
> __va_list_tag __va_list_tag*) -->
>      <function-decl name='vswscanf' filepath='/usr/include/wchar.h'
> line='701' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -550,7 +550,7 @@
>        <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
>        <parameter type-id='type-id-73'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int vwprintf(const wchar_t*, typedef __va_list_tag
> __va_list_tag*) -->
>      <function-decl name='vwprintf' filepath='/usr/include/wchar.h'
> line='620' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -559,7 +559,7 @@
>        <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
>        <parameter type-id='type-id-73'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int vwscanf(const wchar_t*, typedef __va_list_tag
> __va_list_tag*) -->
>      <function-decl name='vwscanf' filepath='/usr/include/wchar.h'
> line='697' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -568,7 +568,7 @@
>        <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
>        <parameter type-id='type-id-73'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- size_t wcrtomb(char*, wchar_t, mbstate_t*) -->
>      <function-decl name='wcrtomb' filepath='/usr/include/wchar.h'
> line='370' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -597,7 +597,7 @@
>        <!-- parameter of type 'const wchar_t*' -->
>        <parameter type-id='type-id-63'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int wcscoll(const wchar_t*, const wchar_t*) -->
>      <function-decl name='wcscoll' filepath='/usr/include/wchar.h'
> line='192' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -606,7 +606,7 @@
>        <!-- parameter of type 'const wchar_t*' -->
>        <parameter type-id='type-id-63'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- wchar_t* wcscpy(wchar_t*, const wchar_t*) -->
>      <function-decl name='wcscpy' filepath='/usr/include/wchar.h'
> line='147' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -666,7 +666,7 @@
>        <!-- parameter of type 'typedef size_t' -->
>        <parameter type-id='type-id-23'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- wchar_t* wcsncpy(wchar_t*, const wchar_t*, size_t) -->
>      <function-decl name='wcsncpy' filepath='/usr/include/wchar.h'
> line='150' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -708,7 +708,7 @@
>        <!-- parameter of type 'wchar_t**' -->
>        <parameter type-id='type-id-75'/>
>        <!-- double -->
> -      <return type-id='type-id-7'/>
> +      <return type-id='type-id-6'/>
>      </function-decl>
>      <!-- float wcstof(const wchar_t*, wchar_t**) -->
>      <function-decl name='wcstof' filepath='/usr/include/wchar.h'
> line='457' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -717,7 +717,7 @@
>        <!-- parameter of type 'wchar_t**' -->
>        <parameter type-id='type-id-75'/>
>        <!-- float -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-7'/>
>      </function-decl>
>      <!-- wchar_t* wcstok(wchar_t*, const wchar_t*, wchar_t**) -->
>      <function-decl name='wcstok' filepath='/usr/include/wchar.h'
> line='282' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -737,9 +737,9 @@
>        <!-- parameter of type 'wchar_t**' -->
>        <parameter type-id='type-id-75'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- long int -->
> -      <return type-id='type-id-11'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- unsigned long int wcstoul(const wchar_t*, wchar_t**, int) -->
>      <function-decl name='wcstoul' filepath='/usr/include/wchar.h'
> line='473' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -748,7 +748,7 @@
>        <!-- parameter of type 'wchar_t**' -->
>        <parameter type-id='type-id-75'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- unsigned long int -->
>        <return type-id='type-id-15'/>
>      </function-decl>
> @@ -768,7 +768,7 @@
>        <!-- parameter of type 'typedef wint_t' -->
>        <parameter type-id='type-id-20'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int wmemcmp(const wchar_t*, const wchar_t*, size_t) -->
>      <function-decl name='wmemcmp' filepath='/usr/include/wchar.h'
> line='325' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -779,7 +779,7 @@
>        <!-- parameter of type 'typedef size_t' -->
>        <parameter type-id='type-id-23'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- wchar_t* wmemcpy(wchar_t*, const wchar_t*, size_t) -->
>      <function-decl name='wmemcpy' filepath='/usr/include/wchar.h'
> line='329' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -820,7 +820,7 @@
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int wscanf(const wchar_t*, ...) -->
>      <function-decl name='wscanf' filepath='/usr/include/wchar.h'
> line='642' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -828,7 +828,7 @@
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- const wchar_t* wcschr(const wchar_t*, wchar_t) -->
>      <function-decl name='wcschr' mangled-name='wcschr'
> filepath='/usr/include/wchar.h' line='224' column='1' visibility='default'
> binding='global' size-in-bits='64'>
> @@ -884,7 +884,7 @@
>        <!-- parameter of type 'wchar_t**' -->
>        <parameter type-id='type-id-75'/>
>        <!-- long double -->
> -      <return type-id='type-id-10'/>
> +      <return type-id='type-id-9'/>
>      </function-decl>
>      <!-- long long int wcstoll(const wchar_t*, wchar_t**, int) -->
>      <function-decl name='wcstoll' filepath='/usr/include/wchar.h'
> line='483' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -893,9 +893,9 @@
>        <!-- parameter of type 'wchar_t**' -->
>        <parameter type-id='type-id-75'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- long long int -->
> -      <return type-id='type-id-12'/>
> +      <return type-id='type-id-11'/>
>      </function-decl>
>      <!-- long long unsigned int wcstoull(const wchar_t*, wchar_t**, int)
> -->
>      <function-decl name='wcstoull' filepath='/usr/include/wchar.h'
> line='490' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -904,14 +904,14 @@
>        <!-- parameter of type 'wchar_t**' -->
>        <parameter type-id='type-id-75'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- long long unsigned int -->
> -      <return type-id='type-id-13'/>
> +      <return type-id='type-id-12'/>
>      </function-decl>
>      <!-- char* setlocale(int, const char*) -->
>      <function-decl name='setlocale' filepath='/usr/include/locale.h'
> line='125' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-29'/>
>        <!-- char* -->
> @@ -929,7 +929,7 @@
>        <!-- parameter of type 'typedef wctype_t' -->
>        <parameter type-id='type-id-30'/>
>        <!-- int -->
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- wint_t towctrans(wint_t, wctrans_t) -->
>      <function-decl name='towctrans' filepath='/usr/include/wctype.h'
> line='221' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -1353,7 +1353,7 @@
>              <!-- parameter of type 'typedef std::basic_string<char,
> std::char_traits<char>, std::allocator<char> >::size_type' -->
>              <parameter type-id='type-id-57'/>
>              <!-- int -->
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
> @@ -1499,7 +1499,7 @@
>              <!-- implicit parameter of type 'std::basic_string<char,
> std::char_traits<char>, std::allocator<char> >*' -->
>              <parameter type-id='type-id-67' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-9' is-artificial='yes'/>
> +            <parameter type-id='type-id-8' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-18'/>
>            </function-decl>
> @@ -2723,7 +2723,7 @@
>              <!-- parameter of type 'const std::basic_string<char,
> std::char_traits<char>, std::allocator<char> >&' -->
>              <parameter type-id='type-id-53'/>
>              <!-- int -->
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -2738,7 +2738,7 @@
>              <!-- parameter of type 'const std::basic_string<char,
> std::char_traits<char>, std::allocator<char> >&' -->
>              <parameter type-id='type-id-53'/>
>              <!-- int -->
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -2757,7 +2757,7 @@
>              <!-- parameter of type 'typedef std::basic_string<char,
> std::char_traits<char>, std::allocator<char> >::size_type' -->
>              <parameter type-id='type-id-57'/>
>              <!-- int -->
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -2768,7 +2768,7 @@
>              <!-- parameter of type 'const char*' -->
>              <parameter type-id='type-id-29'/>
>              <!-- int -->
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -2783,7 +2783,7 @@
>              <!-- parameter of type 'const char*' -->
>              <parameter type-id='type-id-29'/>
>              <!-- int -->
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -2800,7 +2800,7 @@
>              <!-- parameter of type 'typedef std::basic_string<char,
> std::char_traits<char>, std::allocator<char> >::size_type' -->
>              <parameter type-id='type-id-57'/>
>              <!-- int -->
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -2837,7 +2837,7 @@
>        <!-- typedef unsigned long int std::size_t -->
>        <typedef-decl name='size_t' type-id='type-id-15'
> filepath='/usr/include/c++/4.8.2/x86_64-redhat-linux/bits/c++config.h'
> line='1857' column='1' id='type-id-109'/>
>        <!-- typedef long int std::ptrdiff_t -->
> -      <typedef-decl name='ptrdiff_t' type-id='type-id-11'
> filepath='/usr/include/c++/4.8.2/x86_64-redhat-linux/bits/c++config.h'
> line='1858' column='1' id='type-id-110'/>
> +      <typedef-decl name='ptrdiff_t' type-id='type-id-10'
> filepath='/usr/include/c++/4.8.2/x86_64-redhat-linux/bits/c++config.h'
> line='1858' column='1' id='type-id-110'/>
>        <!-- class std::reverse_iterator<__gnu_cxx::__normal_iterator<char
> const*, std::basic_string<char, std::char_traits<char>,
> std::allocator<char> > > > -->
>        <class-decl
> name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*,
> std::basic_string&lt;char, std::char_traits&lt;char&gt;,
> std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default'
> is-declaration-only='yes' id='type-id-104'/>
>        <!-- class
> std::reverse_iterator<__gnu_cxx::__normal_iterator<char*,
> std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >
> -->
> diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
> b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
> index 71df361..3018522 100644
> --- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
> +++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
> @@ -121,19 +121,12 @@ Variables changes summary: 0 Removed, 0 Changed, 3
> Added variables
>      parameter 2 of type 'lttng_event_context*' has sub-type changes:
>        in pointed to type 'struct lttng_event_context':
>          type size hasn't changed
> -        2 data member changes:
> +        1 data member change:
>            type of 'lttng_event_context_type lttng_event_context::ctx'
> changed:
>              type size hasn't changed
>              2 enumerator insertions:
>
>  'lttng_event_context_type::LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL' value '20'
>
>  'lttng_event_context_type::LTTNG_EVENT_CONTEXT_CALLSTACK_USER' value '21'
> -          type of 'union {lttng_event_perf_counter_ctx perf_counter;
> struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
> lttng_event_context::u' changed:
> -            type name changed from '__anonymous_union__4' to
> '__anonymous_union__5'
> -            type size hasn't changed
> -            type changed from:
> -              union {lttng_event_perf_counter_ctx perf_counter; struct
> {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
> -            to:
> -              union {lttng_event_perf_counter_ctx perf_counter; struct
> {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
>
>    [C] 'function lttng_condition_status
> lttng_condition_buffer_usage_get_channel_name(const lttng_condition*, const
> char**)' has some indirect sub-type changes:
>      parameter 1 of type 'const lttng_condition*' has sub-type changes:
> diff --git
> a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
> b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
> index d30e8c6..c4b3a76 100644
> --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
> +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
> @@ -1298,7 +1298,7 @@ Variable symbols changes summary: 0 Removed, 0 Added
> variable symbol not referen
>      parameter 1 of type 'VarDesc*' has sub-type changes:
>        in pointed to type 'struct VarDesc':
>          type size hasn't changed
> -        1 data member changes (2 filtered):
> +        1 data member change:
>            type of 'union {struct {uint32_t is_static; uint32_t
> is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t
> sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t
> is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
>              type name changed from 'VarDesc::__anonymous_union__2' to
> 'varDescFlags'
>              type size hasn't changed
> @@ -1312,13 +1312,13 @@ Variable symbols changes summary: 0 Removed, 0
> Added variable symbol not referen
>      parameter 1 of type 'InitTableEntry*' changed:
>        in pointed to type 'struct InitTableEntry':
>          entity changed from 'struct InitTableEntry' to compatible type
> 'typedef InitTableEntry'
> -          type name changed from 'InitTableEntry' to
> '__anonymous_struct__2'
> +          type name changed from 'InitTableEntry' to
> '__anonymous_struct__1'
>            type size hasn't changed
>            1 data member change:
>              type of 'void ()* InitTableEntry::func' changed:
>                in pointed to type 'function type void ()':
>                  parameter 1 of type 'typedef MyoArena' was added
> -            and name of 'InitTableEntry::func' changed to
> '__anonymous_struct__2::func'
> +            and name of 'InitTableEntry::func' changed to
> '__anonymous_struct__1::func'
>
>    [C] 'function int __offload_offload(OFFLOAD, const char*, int, int,
> VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect
> sub-type changes:
>      parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
> diff --git
> a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
> b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
> index 800cc67..03c1542 100644
> --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
> +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
> @@ -1298,7 +1298,7 @@ Variable symbols changes summary: 0 Removed, 0 Added
> variable symbol not referen
>      parameter 1 of type 'VarDesc*' has sub-type changes:
>        in pointed to type 'struct VarDesc' at offload_common.h:254:1:
>          type size hasn't changed
> -        1 data member changes (2 filtered):
> +        1 data member change:
>            type of 'union {struct {uint32_t is_static; uint32_t
> is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t
> sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t
> is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
>              type name changed from 'VarDesc::__anonymous_union__2' to
> 'varDescFlags'
>              type size hasn't changed
> @@ -1312,13 +1312,13 @@ Variable symbols changes summary: 0 Removed, 0
> Added variable symbol not referen
>      parameter 1 of type 'InitTableEntry*' changed:
>        in pointed to type 'struct InitTableEntry' at offload_table.h:296:1:
>          entity changed from 'struct InitTableEntry' to compatible type
> 'typedef InitTableEntry' at offload_table.h:296:1
> -          type name changed from 'InitTableEntry' to
> '__anonymous_struct__2'
> +          type name changed from 'InitTableEntry' to
> '__anonymous_struct__1'
>            type size hasn't changed
>            1 data member change:
>              type of 'void ()* InitTableEntry::func' changed:
>                in pointed to type 'function type void ()':
>                  parameter 1 of type 'typedef MyoArena' was added
> -            and name of 'InitTableEntry::func' changed to
> '__anonymous_struct__2::func' at offload_table.h:295:1
> +            and name of 'InitTableEntry::func' changed to
> '__anonymous_struct__1::func' at offload_table.h:295:1
>
>    [C] 'function int __offload_offload(OFFLOAD, const char*, int, int,
> VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at
> compiler_if_host.cpp:456:1 has some indirect sub-type changes:
>      parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
> diff --git
> a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
> b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
> index e7bfbe2..f28bb6b 100644
> --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
> +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
> @@ -1298,7 +1298,7 @@ Variable symbols changes summary: 0 Removed, 0 Added
> variable symbol not referen
>      parameter 1 of type 'VarDesc*' has sub-type changes:
>        in pointed to type 'struct VarDesc' at offload_common.h:254:1:
>          type size hasn't changed
> -        1 data member changes (2 filtered):
> +        1 data member change:
>            type of 'union {struct {uint32_t is_static; uint32_t
> is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t
> sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t
> is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
>              type name changed from 'VarDesc::__anonymous_union__2' to
> 'varDescFlags'
>              type size hasn't changed
> @@ -1312,13 +1312,13 @@ Variable symbols changes summary: 0 Removed, 0
> Added variable symbol not referen
>      parameter 1 of type 'InitTableEntry*' changed:
>        in pointed to type 'struct InitTableEntry' at offload_table.h:296:1:
>          entity changed from 'struct InitTableEntry' to compatible type
> 'typedef InitTableEntry' at offload_table.h:296:1
> -          type name changed from 'InitTableEntry' to
> '__anonymous_struct__2'
> +          type name changed from 'InitTableEntry' to
> '__anonymous_struct__1'
>            type size hasn't changed
>            1 data member change:
>              type of 'void ()* InitTableEntry::func' changed:
>                in pointed to type 'function type void ()':
>                  parameter 1 of type 'typedef MyoArena' was added
> -            and name of 'InitTableEntry::func' changed to
> '__anonymous_struct__2::func' at offload_table.h:295:1
> +            and name of 'InitTableEntry::func' changed to
> '__anonymous_struct__1::func' at offload_table.h:295:1
>
>    [C] 'function int __offload_offload(OFFLOAD, const char*, int, int,
> VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at
> compiler_if_host.cpp:456:1 has some indirect sub-type changes:
>      parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
> diff --git
> a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
> b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
> index 0c11fb6..f7280b4 100644
> --- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
> +++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
> @@ -214,7 +214,7 @@ Variable symbols changes summary: 0 Removed, 0 Added
> variable symbol not referen
>      parameter 1 of type 'VarDesc*' has sub-type changes:
>        in pointed to type 'struct VarDesc':
>          type size hasn't changed
> -        1 data member changes (2 filtered):
> +        1 data member change:
>            type of 'union {struct {uint32_t is_static; uint32_t
> is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t
> sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t
> is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
>              type name changed from 'VarDesc::__anonymous_union__2' to
> 'varDescFlags'
>              type size hasn't changed
> @@ -228,13 +228,13 @@ Variable symbols changes summary: 0 Removed, 0 Added
> variable symbol not referen
>      parameter 1 of type 'InitTableEntry*' changed:
>        in pointed to type 'struct InitTableEntry':
>          entity changed from 'struct InitTableEntry' to compatible type
> 'typedef InitTableEntry'
> -          type name changed from 'InitTableEntry' to
> '__anonymous_struct__2'
> +          type name changed from 'InitTableEntry' to
> '__anonymous_struct__1'
>            type size hasn't changed
>            1 data member change:
>              type of 'void ()* InitTableEntry::func' changed:
>                in pointed to type 'function type void ()':
>                  parameter 1 of type 'typedef MyoArena' was added
> -            and name of 'InitTableEntry::func' changed to
> '__anonymous_struct__2::func'
> +            and name of 'InitTableEntry::func' changed to
> '__anonymous_struct__1::func'
>
>    [C] 'function int __offload_offload(OFFLOAD, const char*, int, int,
> VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect
> sub-type changes:
>      parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
> diff --git
> a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
> b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
> index a0bfc76..550ef6f 100644
> ---
> a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
> +++
> b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
> @@ -92,7 +92,7 @@
>
>                        in pointed to type 'typedef RedChannelClient' at
> red_channel.h:131:1:
>
>                          underlying type 'struct RedChannelClient' at
> red_channel.h:247:1 changed:
>
>                            type size hasn't changed
> -
>                           3 data member changes (2 filtered):
> +
>                           3 data member changes:
>
>                              type of 'RedChannel*
> RedChannelClient::channel' changed:
>
>                                in pointed to type 'typedef RedChannel' at
> red_channel.h:130:1:
>
>                                  underlying type 'struct RedChannel'
> changed, as being reported
> diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
> b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
> index cbe8d20..5349383 100644
> --- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
> +++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
> @@ -11476,623 +11476,6 @@
>      </function-type>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='drivers/mmc/host/sdhci.mod.c'
> comp-dir-path='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common'
> language='LANG_C89'>
> -    <class-decl name='__anonymous_struct__2' size-in-bits='6848'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='373' column='1' id='type-id-1555'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='mmap' type-id='type-id-222' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='374' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='mm_rb' type-id='type-id-610' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='375' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='vmacache_seqnum' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='376' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='get_unmapped_area' type-id='type-id-643'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='378' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='mmap_base' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='382' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='mmap_legacy_base' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='383' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='task_size' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='389' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='highest_vm_end' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='390' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='pgd' type-id='type-id-644' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='391' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='mm_users' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='402' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='608'>
> -        <var-decl name='mm_count' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='411' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='pgtables_bytes' type-id='type-id-17'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='414' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='map_count' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='416' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='736'>
> -        <var-decl name='page_table_lock' type-id='type-id-234'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='418' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='mmap_sem' type-id='type-id-399'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='421' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1088'>
> -        <var-decl name='mmlist' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='423' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1216'>
> -        <var-decl name='hiwater_rss' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='430' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1280'>
> -        <var-decl name='hiwater_vm' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='431' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1344'>
> -        <var-decl name='total_vm' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='433' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1408'>
> -        <var-decl name='locked_vm' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='434' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1472'>
> -        <var-decl name='pinned_vm' type-id='type-id-402'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='435' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1536'>
> -        <var-decl name='data_vm' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='436' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1600'>
> -        <var-decl name='exec_vm' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='437' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1664'>
> -        <var-decl name='stack_vm' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='438' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1728'>
> -        <var-decl name='def_flags' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='439' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1792'>
> -        <var-decl name='arg_lock' type-id='type-id-234'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='441' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1856'>
> -        <var-decl name='start_code' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='442' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1920'>
> -        <var-decl name='end_code' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='442' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1984'>
> -        <var-decl name='start_data' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='442' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2048'>
> -        <var-decl name='end_data' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='442' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2112'>
> -        <var-decl name='start_brk' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='443' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2176'>
> -        <var-decl name='brk' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='443' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2240'>
> -        <var-decl name='start_stack' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='443' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2304'>
> -        <var-decl name='arg_start' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='444' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2368'>
> -        <var-decl name='arg_end' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='444' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2432'>
> -        <var-decl name='env_start' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='444' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2496'>
> -        <var-decl name='env_end' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='444' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='2560'>
> -        <var-decl name='saved_auxv' type-id='type-id-215'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='446' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='5504'>
> -        <var-decl name='rss_stat' type-id='type-id-645'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='452' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='5760'>
> -        <var-decl name='binfmt' type-id='type-id-646'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='454' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='5824'>
> -        <var-decl name='context' type-id='type-id-647'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='457' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6016'>
> -        <var-decl name='flags' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='459' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6080'>
> -        <var-decl name='core_state' type-id='type-id-648'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='461' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6144'>
> -        <var-decl name='membarrier_state' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='463' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6176'>
> -        <var-decl name='ioctx_lock' type-id='type-id-234'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='466' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6208'>
> -        <var-decl name='ioctx_table' type-id='type-id-649'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='467' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6272'>
> -        <var-decl name='owner' type-id='type-id-292' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='480' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6336'>
> -        <var-decl name='user_ns' type-id='type-id-466'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='482' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6400'>
> -        <var-decl name='exe_file' type-id='type-id-441'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='485' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6464'>
> -        <var-decl name='tlb_flush_pending' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='511' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6528'>
> -        <var-decl name='uprobes_state' type-id='type-id-650'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='516' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='6592'>
> -        <var-decl name='async_put_work' type-id='type-id-241'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='520' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__2' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='34' column='1' id='type-id-1556'>
> -      <data-member access='private'>
> -        <var-decl name='preempt_count' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='35' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='preempt' type-id='type-id-1557'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='44' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__6' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='36' column='1' id='type-id-1557'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='count' type-id='type-id-197' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='41' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='need_resched' type-id='type-id-197'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='42' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__7' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='617' column='1' id='type-id-1558'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='blocked' type-id='type-id-203'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='618' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='8'>
> -        <var-decl name='need_qs' type-id='type-id-203'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='619' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='16'>
> -        <var-decl name='exp_hint' type-id='type-id-203'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='620' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='24'>
> -        <var-decl name='deferred_qs' type-id='type-id-203'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='621' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__3' size-in-bits='320'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='27' column='1' id='type-id-1559'>
> -      <data-member access='private'>
> -        <var-decl name='futex' type-id='type-id-1560'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='36' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='nanosleep' type-id='type-id-1561'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='46' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='poll' type-id='type-id-1562' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='54' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__8' size-in-bits='320'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='29' column='1' id='type-id-1560'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='uaddr' type-id='type-id-780' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='30' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='val' type-id='type-id-197' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='31' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='flags' type-id='type-id-197' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='32' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='bitset' type-id='type-id-197'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='33' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='time' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='34' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='uaddr2' type-id='type-id-780'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='35' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__9' size-in-bits='192'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='38' column='1' id='type-id-1561'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='clockid' type-id='type-id-766'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='39' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='type' type-id='type-id-781' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='40' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='' type-id='type-id-1563' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='41' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='expires' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='45' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__4' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='41' column='1' id='type-id-1563'>
> -      <data-member access='private'>
> -        <var-decl name='rmtp' type-id='type-id-783' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='42' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='compat_rmtp' type-id='type-id-784'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='43' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__10' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='48' column='1' id='type-id-1562'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='ufds' type-id='type-id-789' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='49' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='nfds' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='50' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='has_timeout' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='51' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='tv_sec' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='52' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='tv_nsec' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='53' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__13' size-in-bits='384'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='13' column='1' id='type-id-1564'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='si_signo' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='13' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='si_errno' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='13' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='si_code' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='13' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='_sifields' type-id='type-id-867'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='13' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__14' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='34' column='1' id='type-id-1565'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_pid' type-id='type-id-790' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='35' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='_uid' type-id='type-id-411' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='36' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__15' size-in-bits='192'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='40' column='1' id='type-id-1566'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_tid' type-id='type-id-875' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='41' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='_overrun' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='42' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='_sigval' type-id='type-id-876'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='43' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='_sys_private' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='44' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__16' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='48' column='1' id='type-id-1567'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_pid' type-id='type-id-790' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='49' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='_uid' type-id='type-id-411' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='50' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='_sigval' type-id='type-id-876'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='51' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__17' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='55' column='1' id='type-id-1568'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_pid' type-id='type-id-790' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='56' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='_uid' type-id='type-id-411' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='57' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='_status' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='58' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='_utime' type-id='type-id-878'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='59' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='_stime' type-id='type-id-878'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='60' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__18' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='64' column='1' id='type-id-1569'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_addr' type-id='type-id-225' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='65' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='' type-id='type-id-1570' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='77' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__5' size-in-bits='192'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='77' column='1' id='type-id-1570'>
> -      <data-member access='private'>
> -        <var-decl name='_addr_lsb' type-id='type-id-190'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='82' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='_addr_bnd' type-id='type-id-1571'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='88' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='_addr_pkey' type-id='type-id-1572'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='93' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__19' size-in-bits='192'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='84' column='1' id='type-id-1571'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_dummy_bnd' type-id='type-id-39'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='85' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='_lower' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='86' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='_upper' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='87' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__20' size-in-bits='96'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='90' column='1' id='type-id-1572'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_dummy_pkey' type-id='type-id-39'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='91' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='_pkey' type-id='type-id-2' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='92' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__21' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='98' column='1' id='type-id-1573'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_band' type-id='type-id-164' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='99' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='_fd' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='100' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__22' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='104' column='1' id='type-id-1574'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_call_addr' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='105' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='_syscall' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='106' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='_arch' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='107' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__6' size-in-bits='320'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='78' column='1' id='type-id-1575'>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='97' column='1' id='type-id-593'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='dma_addr' type-id='type-id-229'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='102' column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__1' size-in-bits='320'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='104' column='1' id='type-id-1576'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='' type-id='type-id-1577' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='105' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='128'>
> -            <var-decl name='slab_cache' type-id='type-id-596'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='118' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='192'>
> -            <var-decl name='freelist' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='120' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='256'>
> -            <var-decl name='' type-id='type-id-1578' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='121' column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__2' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='131' column='1' id='type-id-598'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='compound_head' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='132' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='64'>
> -            <var-decl name='compound_dtor' type-id='type-id-208'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='135' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='72'>
> -            <var-decl name='compound_order' type-id='type-id-208'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='136' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='96'>
> -            <var-decl name='compound_mapcount' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='137' column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__3' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='139' column='1' id='type-id-599'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='_compound_pad_1' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='140' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='64'>
> -            <var-decl name='_compound_pad_2' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='141' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='128'>
> -            <var-decl name='deferred_list' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='142' column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__4' size-in-bits='320'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='144' column='1' id='type-id-600'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='_pt_pad_1' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='145' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='64'>
> -            <var-decl name='pmd_huge_pte' type-id='type-id-601'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='146' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='128'>
> -            <var-decl name='_pt_pad_2' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='147' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='192'>
> -            <var-decl name='' type-id='type-id-602' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='148' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='256'>
> -            <var-decl name='ptl' type-id='type-id-234'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='155' column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__5' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='158' column='1' id='type-id-603'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='pgmap' type-id='type-id-604'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='160' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='64'>
> -            <var-decl name='zone_device_data' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='161' column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
> -      <data-member access='private'>
> -        <var-decl name='' type-id='type-id-1579' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='79' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='callback_head' type-id='type-id-372'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='175' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__24' size-in-bits='320'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='79' column='1' id='type-id-1579'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='lru' type-id='type-id-158' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='85' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='mapping' type-id='type-id-369'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='87' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='index' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='88' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='private' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='95' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__7' size-in-bits='128'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='105' column='1' id='type-id-1577'>
> -      <data-member access='private'>
> -        <var-decl name='slab_list' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='106' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='' type-id='type-id-1580' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='107' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__25' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='107' column='1' id='type-id-1580'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-638' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='108' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='pages' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='110' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='pobjects' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='111' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__8' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='121' column='1' id='type-id-1578'>
> -      <data-member access='private'>
> -        <var-decl name='s_mem' type-id='type-id-225' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='122' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='counters' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='123' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='' type-id='type-id-1581' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='124' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__26' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='124' column='1' id='type-id-1581'>
> -      <data-member access='public' layout-offset-in-bits='16'>
> -        <var-decl name='inuse' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='125' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='1'>
> -        <var-decl name='objects' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='126' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='frozen' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='127' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__10' size-in-bits='32'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='178' column='1' id='type-id-1582'>
> -      <data-member access='private'>
> -        <var-decl name='_mapcount' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='183' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='page_type' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='191' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='active' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='193' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='units' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='194' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <union-decl name='__anonymous_union__11' size-in-bits='192'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='64' column='1' id='type-id-1583'>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__' size-in-bits='192'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='70' column='1' id='type-id-1584'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='dup_xol_work' type-id='type-id-372'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='71' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='128'>
> -            <var-decl name='dup_xol_addr' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='72' column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
> -      <data-member access='private'>
> -        <var-decl name='' type-id='type-id-1585' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='65' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__27' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='65' column='1' id='type-id-1585'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='autask' type-id='type-id-890'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='66' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='vaddr' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='67' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__28' size-in-bits='4352'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='134' column='1' id='type-id-1586'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tp_value' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='135' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tp2_value' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='136' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='fpsimd_state' type-id='type-id-899'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='137' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__12' size-in-bits='256'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='321' column='1' id='type-id-1587'>
> -      <data-member access='private'>
> -        <var-decl name='shared' type-id='type-id-1588'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='325' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='anon_name' type-id='type-id-228'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='326' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__30' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='322' column='1' id='type-id-1588'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='rb' type-id='type-id-184' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='323' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='rb_subtree_last' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='324' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__13' size-in-bits='256'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='150' column='1' id='type-id-1589'>
> -      <data-member access='private'>
> -        <var-decl name='dir' type-id='type-id-1036' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='151' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='symlink' type-id='type-id-1037'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='152' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='attr' type-id='type-id-1038' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='153' column='1'/>
> -      </data-member>
> -    </union-decl>
> -    <class-decl name='__anonymous_struct__32' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='109' column='1' id='type-id-1590'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='ino' type-id='type-id-197' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='116' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='generation' type-id='type-id-197'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='117' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <union-decl name='__anonymous_union__14' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h'
> line='76' column='1' id='type-id-1591'>
> -      <data-member access='private'>
> -        <var-decl name='arg' type-id='type-id-225' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h'
> line='77' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='str' type-id='type-id-521' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h'
> line='78' column='1'/>
> -      </data-member>
> -      <data-member access='private'>
> -        <var-decl name='arr' type-id='type-id-522' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h'
> line='79' column='1'/>
> -      </data-member>
> -    </union-decl>
>      <var-decl name='__this_module' type-id='type-id-475'
> mangled-name='__this_module' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common/drivers/mmc/host/sdhci.mod.c'
> line='11' column='1' elf-symbol-id='__this_module'/>
>    </abi-instr>
>  </abi-corpus>
> diff --git a/tests/data/test-read-dwarf/libtest23.so.abi
> b/tests/data/test-read-dwarf/libtest23.so.abi
> index 3cf2613..9b6412f 100644
> --- a/tests/data/test-read-dwarf/libtest23.so.abi
> +++ b/tests/data/test-read-dwarf/libtest23.so.abi
> @@ -14,37 +14,37 @@
>    <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc'
> comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf'
> language='LANG_C_plus_plus'>
>      <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
>      <type-decl name='char' size-in-bits='8' id='type-id-2'/>
> -    <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' id='type-id-3'/>
> -    <class-decl name='typedef __va_list_tag __va_list_tag'
> size-in-bits='192' is-struct='yes' visibility='default' id='type-id-4'>
> +    <class-decl name='typedef __va_list_tag __va_list_tag'
> size-in-bits='192' is-struct='yes' visibility='default' id='type-id-3'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='gp_offset' type-id='type-id-5'
> visibility='default'/>
> +        <var-decl name='gp_offset' type-id='type-id-4'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='fp_offset' type-id='type-id-5'
> visibility='default'/>
> +        <var-decl name='fp_offset' type-id='type-id-4'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='overflow_arg_area' type-id='type-id-6'
> visibility='default'/>
> +        <var-decl name='overflow_arg_area' type-id='type-id-5'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='reg_save_area' type-id='type-id-6'
> visibility='default'/>
> +        <var-decl name='reg_save_area' type-id='type-id-5'
> visibility='default'/>
>        </data-member>
>      </class-decl>
> -    <type-decl name='double' size-in-bits='64' id='type-id-7'/>
> -    <type-decl name='float' size-in-bits='32' id='type-id-8'/>
> -    <type-decl name='int' size-in-bits='32' id='type-id-9'/>
> -    <type-decl name='long double' size-in-bits='128' id='type-id-10'/>
> -    <type-decl name='long int' size-in-bits='64' id='type-id-11'/>
> -    <type-decl name='long long int' size-in-bits='64' id='type-id-12'/>
> -    <type-decl name='long long unsigned int' size-in-bits='64'
> id='type-id-13'/>
> -    <type-decl name='short int' size-in-bits='16' id='type-id-14'/>
> -    <type-decl name='unsigned int' size-in-bits='32' id='type-id-5'/>
> +    <type-decl name='double' size-in-bits='64' id='type-id-6'/>
> +    <type-decl name='float' size-in-bits='32' id='type-id-7'/>
> +    <type-decl name='int' size-in-bits='32' id='type-id-8'/>
> +    <type-decl name='long double' size-in-bits='128' id='type-id-9'/>
> +    <type-decl name='long int' size-in-bits='64' id='type-id-10'/>
> +    <type-decl name='long long int' size-in-bits='64' id='type-id-11'/>
> +    <type-decl name='long long unsigned int' size-in-bits='64'
> id='type-id-12'/>
> +    <type-decl name='short int' size-in-bits='16' id='type-id-13'/>
> +    <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' id='type-id-14'/>
> +    <type-decl name='unsigned int' size-in-bits='32' id='type-id-4'/>
>      <type-decl name='unsigned long int' size-in-bits='64'
> id='type-id-15'/>
>      <array-type-def dimensions='1' type-id='type-id-15'
> size-in-bits='infinite' id='type-id-16'>
>        <subrange length='infinite' id='type-id-17'/>
>      </array-type-def>
>      <type-decl name='void' id='type-id-18'/>
>      <type-decl name='wchar_t' size-in-bits='32' id='type-id-19'/>
> -    <typedef-decl name='wint_t' type-id='type-id-5'
> filepath='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stddef.h'
> line='353' column='1' id='type-id-20'/>
> +    <typedef-decl name='wint_t' type-id='type-id-4'
> filepath='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stddef.h'
> line='353' column='1' id='type-id-20'/>
>      <typedef-decl name='__FILE' type-id='type-id-21'
> filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-22'/>
>      <typedef-decl name='size_t' type-id='type-id-15'
> filepath='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stddef.h'
> line='212' column='1' id='type-id-23'/>
>      <typedef-decl name='mbstate_t' type-id='type-id-24'
> filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-25'/>
> @@ -54,7 +54,7 @@
>          <union-decl name='__anonymous_union__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-27'/>
>        </member-type>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='__count' type-id='type-id-9' visibility='default'
> filepath='/usr/include/wchar.h' line='84' column='1'/>
> +        <var-decl name='__count' type-id='type-id-8' visibility='default'
> filepath='/usr/include/wchar.h' line='84' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='__value' type-id='type-id-27'
> visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
> @@ -62,34 +62,34 @@
>      </class-decl>
>      <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-28'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tm_sec' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='135' column='1'/>
> +        <var-decl name='tm_sec' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='135' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='tm_min' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='136' column='1'/>
> +        <var-decl name='tm_min' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='136' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tm_hour' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='137' column='1'/>
> +        <var-decl name='tm_hour' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='137' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='tm_mday' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='138' column='1'/>
> +        <var-decl name='tm_mday' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='138' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='tm_mon' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='139' column='1'/>
> +        <var-decl name='tm_mon' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='139' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='160'>
> -        <var-decl name='tm_year' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='140' column='1'/>
> +        <var-decl name='tm_year' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='140' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='tm_wday' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='141' column='1'/>
> +        <var-decl name='tm_wday' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='141' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='224'>
> -        <var-decl name='tm_yday' type-id='type-id-9' visibility='default'
> filepath='/usr/include/time.h' line='142' column='1'/>
> +        <var-decl name='tm_yday' type-id='type-id-8' visibility='default'
> filepath='/usr/include/time.h' line='142' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='tm_isdst' type-id='type-id-9'
> visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
> +        <var-decl name='tm_isdst' type-id='type-id-8'
> visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='tm_gmtoff' type-id='type-id-11'
> visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
> +        <var-decl name='tm_gmtoff' type-id='type-id-10'
> visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <var-decl name='tm_zone' type-id='type-id-29'
> visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
> @@ -97,9 +97,9 @@
>      </class-decl>
>      <typedef-decl name='wctype_t' type-id='type-id-15'
> filepath='/usr/include/wctype.h' line='52' column='1' id='type-id-30'/>
>      <typedef-decl name='wctrans_t' type-id='type-id-31'
> filepath='/usr/include/wctype.h' line='186' column='1' id='type-id-32'/>
> -    <typedef-decl name='__int32_t' type-id='type-id-9'
> filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-33'/>
> +    <typedef-decl name='__int32_t' type-id='type-id-8'
> filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-33'/>
>      <pointer-type-def type-id='type-id-22' size-in-bits='64'
> id='type-id-34'/>
> -    <pointer-type-def type-id='type-id-3' size-in-bits='64'
> id='type-id-35'/>
> +    <pointer-type-def type-id='type-id-14' size-in-bits='64'
> id='type-id-35'/>
>      <reference-type-def kind='lvalue' type-id='type-id-2'
> size-in-bits='64' id='type-id-36'/>
>      <pointer-type-def type-id='type-id-2' size-in-bits='64'
> id='type-id-37'/>
>      <qualified-type-def type-id='type-id-33' const='yes' id='type-id-38'/>
> @@ -111,11 +111,11 @@
>      <reference-type-def kind='lvalue' type-id='type-id-43'
> size-in-bits='64' id='type-id-44'/>
>      <pointer-type-def type-id='type-id-43' size-in-bits='64'
> id='type-id-29'/>
>      <pointer-type-def type-id='type-id-29' size-in-bits='64'
> id='type-id-45'/>
> -    <qualified-type-def type-id='type-id-9' const='yes' id='type-id-46'/>
> -    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-47'/>
> +    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-46'/>
> +    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-47'/>
>      <qualified-type-def type-id='type-id-25' const='yes' id='type-id-48'/>
>      <pointer-type-def type-id='type-id-48' size-in-bits='64'
> id='type-id-49'/>
> -    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-50'/>
> +    <qualified-type-def type-id='type-id-13' const='yes' id='type-id-50'/>
>      <qualified-type-def type-id='type-id-51' const='yes' id='type-id-52'/>
>      <reference-type-def kind='lvalue' type-id='type-id-52'
> size-in-bits='64' id='type-id-53'/>
>      <pointer-type-def type-id='type-id-52' size-in-bits='64'
> id='type-id-54'/>
> @@ -134,8 +134,8 @@
>      <pointer-type-def type-id='type-id-55' size-in-bits='64'
> id='type-id-69'/>
>      <qualified-type-def type-id='type-id-70' id='type-id-71'/>
>      <reference-type-def kind='lvalue' type-id='type-id-72'
> size-in-bits='64' id='type-id-70'/>
> -    <pointer-type-def type-id='type-id-4' size-in-bits='64'
> id='type-id-73'/>
> -    <pointer-type-def type-id='type-id-18' size-in-bits='64'
> id='type-id-6'/>
> +    <pointer-type-def type-id='type-id-3' size-in-bits='64'
> id='type-id-73'/>
> +    <pointer-type-def type-id='type-id-18' size-in-bits='64'
> id='type-id-5'/>
>      <pointer-type-def type-id='type-id-19' size-in-bits='64'
> id='type-id-74'/>
>      <pointer-type-def type-id='type-id-74' size-in-bits='64'
> id='type-id-75'/>
>      <namespace-decl name='std'>
> @@ -214,7 +214,7 @@
>        </class-decl>
>      </namespace-decl>
>      <function-decl name='btowc' filepath='/usr/include/wchar.h'
> line='353' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <return type-id='type-id-20'/>
>      </function-decl>
>      <function-decl name='fgetwc' filepath='/usr/include/wchar.h'
> line='745' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -223,7 +223,7 @@
>      </function-decl>
>      <function-decl name='fgetws' filepath='/usr/include/wchar.h'
> line='774' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-74'/>
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <parameter type-id='type-id-34'/>
>        <return type-id='type-id-74'/>
>      </function-decl>
> @@ -235,24 +235,24 @@
>      <function-decl name='fputws' filepath='/usr/include/wchar.h'
> line='781' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-34'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='fwide' filepath='/usr/include/wchar.h'
> line='587' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-34'/>
> -      <parameter type-id='type-id-9'/>
> -      <return type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='fwprintf' filepath='/usr/include/wchar.h'
> line='594' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-34'/>
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='fwscanf' filepath='/usr/include/wchar.h'
> line='635' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-34'/>
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='getwc' filepath='/usr/include/wchar.h'
> line='746' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-34'/>
> @@ -276,7 +276,7 @@
>      </function-decl>
>      <function-decl name='mbsinit' filepath='/usr/include/wchar.h'
> line='361' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-49'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h'
> line='408' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-74'/>
> @@ -299,13 +299,13 @@
>        <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='swscanf' filepath='/usr/include/wchar.h'
> line='645' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='ungetwc' filepath='/usr/include/wchar.h'
> line='789' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-20'/>
> @@ -316,36 +316,36 @@
>        <parameter type-id='type-id-34'/>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-73'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='vfwscanf' filepath='/usr/include/wchar.h'
> line='689' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-34'/>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-73'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='vswprintf' filepath='/usr/include/wchar.h'
> line='625' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-74'/>
>        <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-73'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='vswscanf' filepath='/usr/include/wchar.h'
> line='701' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-73'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='vwprintf' filepath='/usr/include/wchar.h'
> line='620' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-73'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='vwscanf' filepath='/usr/include/wchar.h'
> line='697' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-73'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='wcrtomb' filepath='/usr/include/wchar.h'
> line='370' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-37'/>
> @@ -361,12 +361,12 @@
>      <function-decl name='wcscmp' filepath='/usr/include/wchar.h'
> line='163' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-63'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='wcscoll' filepath='/usr/include/wchar.h'
> line='192' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-63'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='wcscpy' filepath='/usr/include/wchar.h'
> line='147' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-74'/>
> @@ -399,7 +399,7 @@
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-23'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='wcsncpy' filepath='/usr/include/wchar.h'
> line='150' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-74'/>
> @@ -422,12 +422,12 @@
>      <function-decl name='wcstod' filepath='/usr/include/wchar.h'
> line='450' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-75'/>
> -      <return type-id='type-id-7'/>
> +      <return type-id='type-id-6'/>
>      </function-decl>
>      <function-decl name='wcstof' filepath='/usr/include/wchar.h'
> line='457' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-75'/>
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-7'/>
>      </function-decl>
>      <function-decl name='wcstok' filepath='/usr/include/wchar.h'
> line='282' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-74'/>
> @@ -438,13 +438,13 @@
>      <function-decl name='wcstol' filepath='/usr/include/wchar.h'
> line='468' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-75'/>
> -      <parameter type-id='type-id-9'/>
> -      <return type-id='type-id-11'/>
> +      <parameter type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <function-decl name='wcstoul' filepath='/usr/include/wchar.h'
> line='473' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-75'/>
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <function-decl name='wcsxfrm' filepath='/usr/include/wchar.h'
> line='196' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -455,13 +455,13 @@
>      </function-decl>
>      <function-decl name='wctob' filepath='/usr/include/wchar.h'
> line='357' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-20'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='wmemcmp' filepath='/usr/include/wchar.h'
> line='325' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-23'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='wmemcpy' filepath='/usr/include/wchar.h'
> line='329' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-74'/>
> @@ -484,12 +484,12 @@
>      <function-decl name='wprintf' filepath='/usr/include/wchar.h'
> line='601' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='wscanf' filepath='/usr/include/wchar.h'
> line='642' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='wcschr' mangled-name='wcschr'
> filepath='/usr/include/wchar.h' line='224' column='1' visibility='default'
> binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
> @@ -520,22 +520,22 @@
>      <function-decl name='wcstold' filepath='/usr/include/wchar.h'
> line='459' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-75'/>
> -      <return type-id='type-id-10'/>
> +      <return type-id='type-id-9'/>
>      </function-decl>
>      <function-decl name='wcstoll' filepath='/usr/include/wchar.h'
> line='483' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-75'/>
> -      <parameter type-id='type-id-9'/>
> -      <return type-id='type-id-12'/>
> +      <parameter type-id='type-id-8'/>
> +      <return type-id='type-id-11'/>
>      </function-decl>
>      <function-decl name='wcstoull' filepath='/usr/include/wchar.h'
> line='490' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-63'/>
>        <parameter type-id='type-id-75'/>
> -      <parameter type-id='type-id-9'/>
> -      <return type-id='type-id-13'/>
> +      <parameter type-id='type-id-8'/>
> +      <return type-id='type-id-12'/>
>      </function-decl>
>      <function-decl name='setlocale' filepath='/usr/include/locale.h'
> line='125' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-9'/>
> +      <parameter type-id='type-id-8'/>
>        <parameter type-id='type-id-29'/>
>        <return type-id='type-id-37'/>
>      </function-decl>
> @@ -545,7 +545,7 @@
>      <function-decl name='iswctype' filepath='/usr/include/wctype.h'
> line='175' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-20'/>
>        <parameter type-id='type-id-30'/>
> -      <return type-id='type-id-9'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <function-decl name='towctrans' filepath='/usr/include/wctype.h'
> line='221' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-20'/>
> @@ -829,7 +829,7 @@
>            <function-decl name='_S_compare'
> mangled-name='_ZNSs10_S_compareEmm'
> filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='407' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-57'/>
>              <parameter type-id='type-id-57'/>
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
> @@ -920,7 +920,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~basic_string'
> filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='538' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-67' is-artificial='yes'/>
> -            <parameter type-id='type-id-9' is-artificial='yes'/>
> +            <parameter type-id='type-id-8' is-artificial='yes'/>
>              <return type-id='type-id-18'/>
>            </function-decl>
>          </member-function>
> @@ -1676,7 +1676,7 @@
>            <function-decl name='compare'
> mangled-name='_ZNKSs7compareERKSs'
> filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='2225'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-54' is-artificial='yes'/>
>              <parameter type-id='type-id-53'/>
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -1685,7 +1685,7 @@
>              <parameter type-id='type-id-57'/>
>              <parameter type-id='type-id-57'/>
>              <parameter type-id='type-id-53'/>
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -1696,14 +1696,14 @@
>              <parameter type-id='type-id-53'/>
>              <parameter type-id='type-id-57'/>
>              <parameter type-id='type-id-57'/>
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='compare' mangled-name='_ZNKSs7compareEPKc'
> filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='948'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-54' is-artificial='yes'/>
>              <parameter type-id='type-id-29'/>
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -1712,7 +1712,7 @@
>              <parameter type-id='type-id-57'/>
>              <parameter type-id='type-id-57'/>
>              <parameter type-id='type-id-29'/>
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -1722,7 +1722,7 @@
>              <parameter type-id='type-id-57'/>
>              <parameter type-id='type-id-29'/>
>              <parameter type-id='type-id-57'/>
> -            <return type-id='type-id-9'/>
> +            <return type-id='type-id-8'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -1749,7 +1749,7 @@
>      </class-decl>
>      <namespace-decl name='std'>
>        <typedef-decl name='size_t' type-id='type-id-15'
> filepath='/usr/include/c++/4.8.2/x86_64-redhat-linux/bits/c++config.h'
> line='1857' column='1' id='type-id-109'/>
> -      <typedef-decl name='ptrdiff_t' type-id='type-id-11'
> filepath='/usr/include/c++/4.8.2/x86_64-redhat-linux/bits/c++config.h'
> line='1858' column='1' id='type-id-110'/>
> +      <typedef-decl name='ptrdiff_t' type-id='type-id-10'
> filepath='/usr/include/c++/4.8.2/x86_64-redhat-linux/bits/c++config.h'
> line='1858' column='1' id='type-id-110'/>
>        <class-decl
> name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*,
> std::basic_string&lt;char, std::char_traits&lt;char&gt;,
> std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default'
> is-declaration-only='yes' id='type-id-104'/>
>        <class-decl
> name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*,
> std::basic_string&lt;char, std::char_traits&lt;char&gt;,
> std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default'
> is-declaration-only='yes' id='type-id-106'/>
>      </namespace-decl>
> diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi
> b/tests/data/test-read-dwarf/test11-pr18828.so.abi
> index bc70b48..32934d8 100644
> --- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
> +++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
> @@ -663,44 +663,44 @@
>      <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='400'
> id='type-id-19'>
>        <subrange length='50' type-id='type-id-3' id='type-id-20'/>
>      </array-type-def>
> -    <class-decl name='__anonymous_struct__5' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-21'>
> +    <class-decl name='typedef __va_list_tag __va_list_tag'
> size-in-bits='192' is-struct='yes' visibility='default' id='type-id-21'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='__pfn' type-id='type-id-22' visibility='default'
> filepath='/usr/include/c++/4.9/functional' line='1761' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='__delta' type-id='type-id-23'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1761'
> column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='typedef __va_list_tag __va_list_tag'
> size-in-bits='192' is-struct='yes' visibility='default' id='type-id-24'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='gp_offset' type-id='type-id-25'
> visibility='default'/>
> +        <var-decl name='gp_offset' type-id='type-id-22'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='fp_offset' type-id='type-id-25'
> visibility='default'/>
> +        <var-decl name='fp_offset' type-id='type-id-22'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='overflow_arg_area' type-id='type-id-26'
> visibility='default'/>
> +        <var-decl name='overflow_arg_area' type-id='type-id-23'
> visibility='default'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='reg_save_area' type-id='type-id-26'
> visibility='default'/>
> +        <var-decl name='reg_save_area' type-id='type-id-23'
> visibility='default'/>
>        </data-member>
>      </class-decl>
> -    <type-decl name='double' size-in-bits='64' id='type-id-27'/>
> -    <type-decl name='float' size-in-bits='32' id='type-id-28'/>
> -    <type-decl name='int' size-in-bits='32' id='type-id-29'/>
> -    <array-type-def dimensions='1' type-id='type-id-29'
> size-in-bits='320' id='type-id-30'>
> -      <subrange length='10' type-id='type-id-3' id='type-id-31'/>
> +    <type-decl name='double' size-in-bits='64' id='type-id-24'/>
> +    <type-decl name='float' size-in-bits='32' id='type-id-25'/>
> +    <type-decl name='int' size-in-bits='32' id='type-id-26'/>
> +    <array-type-def dimensions='1' type-id='type-id-26'
> size-in-bits='320' id='type-id-27'>
> +      <subrange length='10' type-id='type-id-3' id='type-id-28'/>
>      </array-type-def>
> -    <type-decl name='long double' size-in-bits='128' id='type-id-32'/>
> -    <type-decl name='long int' size-in-bits='64' id='type-id-23'/>
> -    <type-decl name='long long int' size-in-bits='64' id='type-id-33'/>
> -    <type-decl name='long long unsigned int' size-in-bits='64'
> id='type-id-34'/>
> -    <type-decl name='short int' size-in-bits='16' id='type-id-35'/>
> -    <type-decl name='signed char' size-in-bits='8' id='type-id-36'/>
> +    <type-decl name='long double' size-in-bits='128' id='type-id-29'/>
> +    <type-decl name='long int' size-in-bits='64' id='type-id-30'/>
> +    <type-decl name='long long int' size-in-bits='64' id='type-id-31'/>
> +    <type-decl name='long long unsigned int' size-in-bits='64'
> id='type-id-32'/>
> +    <type-decl name='short int' size-in-bits='16' id='type-id-33'/>
> +    <type-decl name='signed char' size-in-bits='8' id='type-id-34'/>
>      <type-decl name='sizetype' size-in-bits='64' id='type-id-3'/>
> -    <array-type-def dimensions='1' type-id='type-id-37'
> size-in-bits='6400' id='type-id-38'>
> -      <subrange length='100' type-id='type-id-3' id='type-id-39'/>
> +    <array-type-def dimensions='1' type-id='type-id-35'
> size-in-bits='6400' id='type-id-36'>
> +      <subrange length='100' type-id='type-id-3' id='type-id-37'/>
>      </array-type-def>
> +    <class-decl name='__anonymous_struct__5' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-38'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='__pfn' type-id='type-id-39' visibility='default'
> filepath='/usr/include/c++/4.9/functional' line='1761' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <var-decl name='__delta' type-id='type-id-30'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1761'
> column='1'/>
> +      </data-member>
> +    </class-decl>
>      <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes'
> size-in-bits='32' alignment-in-bits='32' id='type-id-40'/>
>      <type-decl name='unsigned char' size-in-bits='8' id='type-id-41'/>
>      <array-type-def dimensions='1' type-id='type-id-41'
> size-in-bits='832' id='type-id-42'>
> @@ -718,7 +718,7 @@
>      <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='40'
> id='type-id-48'>
>        <subrange length='5' type-id='type-id-3' id='type-id-49'/>
>      </array-type-def>
> -    <type-decl name='unsigned int' size-in-bits='32' id='type-id-25'/>
> +    <type-decl name='unsigned int' size-in-bits='32' id='type-id-22'/>
>      <type-decl name='unsigned long int' size-in-bits='64'
> id='type-id-50'/>
>      <array-type-def dimensions='1' type-id='type-id-50'
> size-in-bits='39936' id='type-id-51'>
>        <subrange length='624' type-id='type-id-3' id='type-id-52'/>
> @@ -732,25 +732,25 @@
>      <typedef-decl name='lldiv_t' type-id='type-id-58'
> filepath='/usr/include/stdlib.h' line='121' column='1' id='type-id-59'/>
>      <class-decl name='__anonymous_struct__' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-59'
> visibility='default' filepath='/usr/include/stdlib.h' line='118' column='1'
> id='type-id-58'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='quot' type-id='type-id-33' visibility='default'
> filepath='/usr/include/stdlib.h' line='119' column='1'/>
> +        <var-decl name='quot' type-id='type-id-31' visibility='default'
> filepath='/usr/include/stdlib.h' line='119' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='rem' type-id='type-id-33' visibility='default'
> filepath='/usr/include/stdlib.h' line='120' column='1'/>
> +        <var-decl name='rem' type-id='type-id-31' visibility='default'
> filepath='/usr/include/stdlib.h' line='120' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='_Atomic_word' type-id='type-id-29'
> filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/atomic_word.h'
> line='32' column='1' id='type-id-60'/>
> +    <typedef-decl name='_Atomic_word' type-id='type-id-26'
> filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/atomic_word.h'
> line='32' column='1' id='type-id-60'/>
>      <typedef-decl name='time_t' type-id='type-id-61'
> filepath='/usr/include/time.h' line='75' column='1' id='type-id-62'/>
> -    <typedef-decl name='__time_t' type-id='type-id-23'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1'
> id='type-id-61'/>
> -    <typedef-decl name='int64_t' type-id='type-id-23'
> filepath='/usr/include/stdint.h' line='40' column='1' id='type-id-63'/>
> +    <typedef-decl name='__time_t' type-id='type-id-30'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1'
> id='type-id-61'/>
> +    <typedef-decl name='int64_t' type-id='type-id-30'
> filepath='/usr/include/stdint.h' line='40' column='1' id='type-id-63'/>
>      <typedef-decl name='size_t' type-id='type-id-50'
> filepath='/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h' line='212'
> column='1' id='type-id-64'/>
>      <typedef-decl name='uint64_t' type-id='type-id-50'
> filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-65'/>
> -    <typedef-decl name='uint32_t' type-id='type-id-25'
> filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-66'/>
> -    <typedef-decl name='int32_t' type-id='type-id-29'
> filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-67'/>
> -    <typedef-decl name='wint_t' type-id='type-id-25'
> filepath='/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h' line='353'
> column='1' id='type-id-68'/>
> +    <typedef-decl name='uint32_t' type-id='type-id-22'
> filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-66'/>
> +    <typedef-decl name='int32_t' type-id='type-id-26'
> filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-67'/>
> +    <typedef-decl name='wint_t' type-id='type-id-22'
> filepath='/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h' line='353'
> column='1' id='type-id-68'/>
>      <typedef-decl name='__FILE' type-id='type-id-69'
> filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-70'/>
>      <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes'
> visibility='default' filepath='/usr/include/libio.h' line='245' column='1'
> id='type-id-69'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='_flags' type-id='type-id-29' visibility='default'
> filepath='/usr/include/libio.h' line='246' column='1'/>
> +        <var-decl name='_flags' type-id='type-id-26' visibility='default'
> filepath='/usr/include/libio.h' line='246' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='_IO_read_ptr' type-id='type-id-71'
> visibility='default' filepath='/usr/include/libio.h' line='251' column='1'/>
> @@ -792,10 +792,10 @@
>          <var-decl name='_chain' type-id='type-id-73' visibility='default'
> filepath='/usr/include/libio.h' line='266' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='_fileno' type-id='type-id-29'
> visibility='default' filepath='/usr/include/libio.h' line='268' column='1'/>
> +        <var-decl name='_fileno' type-id='type-id-26'
> visibility='default' filepath='/usr/include/libio.h' line='268' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='928'>
> -        <var-decl name='_flags2' type-id='type-id-29'
> visibility='default' filepath='/usr/include/libio.h' line='272' column='1'/>
> +        <var-decl name='_flags2' type-id='type-id-26'
> visibility='default' filepath='/usr/include/libio.h' line='272' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
>          <var-decl name='_old_offset' type-id='type-id-74'
> visibility='default' filepath='/usr/include/libio.h' line='274' column='1'/>
> @@ -804,7 +804,7 @@
>          <var-decl name='_cur_column' type-id='type-id-55'
> visibility='default' filepath='/usr/include/libio.h' line='278' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1040'>
> -        <var-decl name='_vtable_offset' type-id='type-id-36'
> visibility='default' filepath='/usr/include/libio.h' line='279' column='1'/>
> +        <var-decl name='_vtable_offset' type-id='type-id-34'
> visibility='default' filepath='/usr/include/libio.h' line='279' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1048'>
>          <var-decl name='_shortbuf' type-id='type-id-11'
> visibility='default' filepath='/usr/include/libio.h' line='280' column='1'/>
> @@ -816,22 +816,22 @@
>          <var-decl name='_offset' type-id='type-id-76'
> visibility='default' filepath='/usr/include/libio.h' line='293' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1216'>
> -        <var-decl name='__pad1' type-id='type-id-26' visibility='default'
> filepath='/usr/include/libio.h' line='302' column='1'/>
> +        <var-decl name='__pad1' type-id='type-id-23' visibility='default'
> filepath='/usr/include/libio.h' line='302' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1280'>
> -        <var-decl name='__pad2' type-id='type-id-26' visibility='default'
> filepath='/usr/include/libio.h' line='303' column='1'/>
> +        <var-decl name='__pad2' type-id='type-id-23' visibility='default'
> filepath='/usr/include/libio.h' line='303' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1344'>
> -        <var-decl name='__pad3' type-id='type-id-26' visibility='default'
> filepath='/usr/include/libio.h' line='304' column='1'/>
> +        <var-decl name='__pad3' type-id='type-id-23' visibility='default'
> filepath='/usr/include/libio.h' line='304' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1408'>
> -        <var-decl name='__pad4' type-id='type-id-26' visibility='default'
> filepath='/usr/include/libio.h' line='305' column='1'/>
> +        <var-decl name='__pad4' type-id='type-id-23' visibility='default'
> filepath='/usr/include/libio.h' line='305' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1472'>
>          <var-decl name='__pad5' type-id='type-id-64' visibility='default'
> filepath='/usr/include/libio.h' line='306' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1536'>
> -        <var-decl name='_mode' type-id='type-id-29' visibility='default'
> filepath='/usr/include/libio.h' line='308' column='1'/>
> +        <var-decl name='_mode' type-id='type-id-26' visibility='default'
> filepath='/usr/include/libio.h' line='308' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1568'>
>          <var-decl name='_unused2' type-id='type-id-13'
> visibility='default' filepath='/usr/include/libio.h' line='310' column='1'/>
> @@ -845,19 +845,19 @@
>          <var-decl name='_sbuf' type-id='type-id-73' visibility='default'
> filepath='/usr/include/libio.h' line='162' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='_pos' type-id='type-id-29' visibility='default'
> filepath='/usr/include/libio.h' line='166' column='1'/>
> +        <var-decl name='_pos' type-id='type-id-26' visibility='default'
> filepath='/usr/include/libio.h' line='166' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='__off_t' type-id='type-id-23'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='131' column='1'
> id='type-id-74'/>
> +    <typedef-decl name='__off_t' type-id='type-id-30'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='131' column='1'
> id='type-id-74'/>
>      <typedef-decl name='_IO_lock_t' type-id='type-id-56'
> filepath='/usr/include/libio.h' line='154' column='1' id='type-id-78'/>
> -    <typedef-decl name='__off64_t' type-id='type-id-23'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='132' column='1'
> id='type-id-76'/>
> +    <typedef-decl name='__off64_t' type-id='type-id-30'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='132' column='1'
> id='type-id-76'/>
>      <typedef-decl name='mbstate_t' type-id='type-id-79'
> filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-80'/>
>      <typedef-decl name='__mbstate_t' type-id='type-id-81'
> filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-79'/>
>      <class-decl name='__anonymous_struct__1' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-79'
> visibility='default' filepath='/usr/include/wchar.h' line='83' column='1'
> id='type-id-81'>
>        <member-type access='public'>
>          <union-decl name='__anonymous_union__' size-in-bits='32'
> is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h'
> line='86' column='1' id='type-id-82'>
>            <data-member access='private'>
> -            <var-decl name='__wch' type-id='type-id-25'
> visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
> +            <var-decl name='__wch' type-id='type-id-22'
> visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
>            </data-member>
>            <data-member access='private'>
>              <var-decl name='__wchb' type-id='type-id-17'
> visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
> @@ -865,7 +865,7 @@
>          </union-decl>
>        </member-type>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='__count' type-id='type-id-29'
> visibility='default' filepath='/usr/include/wchar.h' line='84' column='1'/>
> +        <var-decl name='__count' type-id='type-id-26'
> visibility='default' filepath='/usr/include/wchar.h' line='84' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='__value' type-id='type-id-82'
> visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
> @@ -873,34 +873,34 @@
>      </class-decl>
>      <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-83'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tm_sec' type-id='type-id-29' visibility='default'
> filepath='/usr/include/time.h' line='135' column='1'/>
> +        <var-decl name='tm_sec' type-id='type-id-26' visibility='default'
> filepath='/usr/include/time.h' line='135' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='tm_min' type-id='type-id-29' visibility='default'
> filepath='/usr/include/time.h' line='136' column='1'/>
> +        <var-decl name='tm_min' type-id='type-id-26' visibility='default'
> filepath='/usr/include/time.h' line='136' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tm_hour' type-id='type-id-29'
> visibility='default' filepath='/usr/include/time.h' line='137' column='1'/>
> +        <var-decl name='tm_hour' type-id='type-id-26'
> visibility='default' filepath='/usr/include/time.h' line='137' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='tm_mday' type-id='type-id-29'
> visibility='default' filepath='/usr/include/time.h' line='138' column='1'/>
> +        <var-decl name='tm_mday' type-id='type-id-26'
> visibility='default' filepath='/usr/include/time.h' line='138' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='tm_mon' type-id='type-id-29' visibility='default'
> filepath='/usr/include/time.h' line='139' column='1'/>
> +        <var-decl name='tm_mon' type-id='type-id-26' visibility='default'
> filepath='/usr/include/time.h' line='139' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='160'>
> -        <var-decl name='tm_year' type-id='type-id-29'
> visibility='default' filepath='/usr/include/time.h' line='140' column='1'/>
> +        <var-decl name='tm_year' type-id='type-id-26'
> visibility='default' filepath='/usr/include/time.h' line='140' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='tm_wday' type-id='type-id-29'
> visibility='default' filepath='/usr/include/time.h' line='141' column='1'/>
> +        <var-decl name='tm_wday' type-id='type-id-26'
> visibility='default' filepath='/usr/include/time.h' line='141' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='224'>
> -        <var-decl name='tm_yday' type-id='type-id-29'
> visibility='default' filepath='/usr/include/time.h' line='142' column='1'/>
> +        <var-decl name='tm_yday' type-id='type-id-26'
> visibility='default' filepath='/usr/include/time.h' line='142' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='tm_isdst' type-id='type-id-29'
> visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
> +        <var-decl name='tm_isdst' type-id='type-id-26'
> visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='tm_gmtoff' type-id='type-id-23'
> visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
> +        <var-decl name='tm_gmtoff' type-id='type-id-30'
> visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <var-decl name='tm_zone' type-id='type-id-84'
> visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
> @@ -984,19 +984,19 @@
>      <typedef-decl name='div_t' type-id='type-id-88'
> filepath='/usr/include/stdlib.h' line='101' column='1' id='type-id-89'/>
>      <class-decl name='__anonymous_struct__2' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-89'
> visibility='default' filepath='/usr/include/stdlib.h' line='98' column='1'
> id='type-id-88'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='quot' type-id='type-id-29' visibility='default'
> filepath='/usr/include/stdlib.h' line='99' column='1'/>
> +        <var-decl name='quot' type-id='type-id-26' visibility='default'
> filepath='/usr/include/stdlib.h' line='99' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='rem' type-id='type-id-29' visibility='default'
> filepath='/usr/include/stdlib.h' line='100' column='1'/>
> +        <var-decl name='rem' type-id='type-id-26' visibility='default'
> filepath='/usr/include/stdlib.h' line='100' column='1'/>
>        </data-member>
>      </class-decl>
>      <typedef-decl name='ldiv_t' type-id='type-id-90'
> filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-91'/>
>      <class-decl name='__anonymous_struct__3' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-91'
> visibility='default' filepath='/usr/include/stdlib.h' line='106' column='1'
> id='type-id-90'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='quot' type-id='type-id-23' visibility='default'
> filepath='/usr/include/stdlib.h' line='107' column='1'/>
> +        <var-decl name='quot' type-id='type-id-30' visibility='default'
> filepath='/usr/include/stdlib.h' line='107' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='rem' type-id='type-id-23' visibility='default'
> filepath='/usr/include/stdlib.h' line='108' column='1'/>
> +        <var-decl name='rem' type-id='type-id-30' visibility='default'
> filepath='/usr/include/stdlib.h' line='108' column='1'/>
>        </data-member>
>      </class-decl>
>      <typedef-decl name='FILE' type-id='type-id-69'
> filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-92'/>
> @@ -1012,11 +1012,11 @@
>      </class-decl>
>      <typedef-decl name='wctype_t' type-id='type-id-50'
> filepath='/usr/include/wctype.h' line='52' column='1' id='type-id-96'/>
>      <typedef-decl name='wctrans_t' type-id='type-id-97'
> filepath='/usr/include/wctype.h' line='186' column='1' id='type-id-98'/>
> -    <typedef-decl name='__int32_t' type-id='type-id-29'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='40' column='1'
> id='type-id-99'/>
> +    <typedef-decl name='__int32_t' type-id='type-id-26'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='40' column='1'
> id='type-id-99'/>
>      <typedef-decl name='clock_t' type-id='type-id-100'
> filepath='/usr/include/time.h' line='59' column='1' id='type-id-101'/>
> -    <typedef-decl name='__clock_t' type-id='type-id-23'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1'
> id='type-id-100'/>
> -    <typedef-decl name='int8_t' type-id='type-id-36'
> filepath='/usr/include/stdint.h' line='36' column='1' id='type-id-102'/>
> -    <typedef-decl name='intmax_t' type-id='type-id-23'
> filepath='/usr/include/stdint.h' line='134' column='1' id='type-id-103'/>
> +    <typedef-decl name='__clock_t' type-id='type-id-30'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1'
> id='type-id-100'/>
> +    <typedef-decl name='int8_t' type-id='type-id-34'
> filepath='/usr/include/stdint.h' line='36' column='1' id='type-id-102'/>
> +    <typedef-decl name='intmax_t' type-id='type-id-30'
> filepath='/usr/include/stdint.h' line='134' column='1' id='type-id-103'/>
>      <pointer-type-def type-id='type-id-92' size-in-bits='64'
> id='type-id-104'/>
>      <pointer-type-def type-id='type-id-69' size-in-bits='64'
> id='type-id-73'/>
>      <pointer-type-def type-id='type-id-78' size-in-bits='64'
> id='type-id-75'/>
> @@ -1237,12 +1237,12 @@
>      <pointer-type-def type-id='type-id-84' size-in-bits='64'
> id='type-id-365'/>
>      <qualified-type-def type-id='type-id-94' const='yes'
> id='type-id-366'/>
>      <pointer-type-def type-id='type-id-366' size-in-bits='64'
> id='type-id-367'/>
> -    <qualified-type-def type-id='type-id-29' const='yes'
> id='type-id-368'/>
> +    <qualified-type-def type-id='type-id-26' const='yes'
> id='type-id-368'/>
>      <reference-type-def kind='lvalue' type-id='type-id-368'
> size-in-bits='64' id='type-id-369'/>
>      <qualified-type-def type-id='type-id-103' const='yes'
> id='type-id-370'/>
> -    <qualified-type-def type-id='type-id-23' const='yes'
> id='type-id-371'/>
> -    <qualified-type-def type-id='type-id-33' const='yes'
> id='type-id-372'/>
> -    <qualified-type-def type-id='type-id-34' const='yes'
> id='type-id-373'/>
> +    <qualified-type-def type-id='type-id-30' const='yes'
> id='type-id-371'/>
> +    <qualified-type-def type-id='type-id-31' const='yes'
> id='type-id-372'/>
> +    <qualified-type-def type-id='type-id-32' const='yes'
> id='type-id-373'/>
>      <qualified-type-def type-id='type-id-80' const='yes'
> id='type-id-374'/>
>      <pointer-type-def type-id='type-id-374' size-in-bits='64'
> id='type-id-375'/>
>      <qualified-type-def type-id='type-id-376' const='yes'
> id='type-id-377'/>
> @@ -1439,8 +1439,8 @@
>      <pointer-type-def type-id='type-id-648' size-in-bits='64'
> id='type-id-649'/>
>      <qualified-type-def type-id='type-id-650' const='yes'
> id='type-id-651'/>
>      <pointer-type-def type-id='type-id-651' size-in-bits='64'
> id='type-id-652'/>
> -    <qualified-type-def type-id='type-id-35' const='yes'
> id='type-id-653'/>
> -    <qualified-type-def type-id='type-id-36' const='yes'
> id='type-id-654'/>
> +    <qualified-type-def type-id='type-id-33' const='yes'
> id='type-id-653'/>
> +    <qualified-type-def type-id='type-id-34' const='yes'
> id='type-id-654'/>
>      <qualified-type-def type-id='type-id-64' const='yes'
> id='type-id-655'/>
>      <qualified-type-def type-id='type-id-656' const='yes'
> id='type-id-657'/>
>      <reference-type-def kind='lvalue' type-id='type-id-657'
> size-in-bits='64' id='type-id-658'/>
> @@ -1749,7 +1749,7 @@
>      <reference-type-def kind='lvalue' type-id='type-id-1100'
> size-in-bits='64' id='type-id-1101'/>
>      <qualified-type-def type-id='type-id-1102' const='yes'
> id='type-id-1103'/>
>      <reference-type-def kind='lvalue' type-id='type-id-1103'
> size-in-bits='64' id='type-id-1104'/>
> -    <qualified-type-def type-id='type-id-37' const='yes'
> id='type-id-1105'/>
> +    <qualified-type-def type-id='type-id-35' const='yes'
> id='type-id-1105'/>
>      <reference-type-def kind='lvalue' type-id='type-id-1105'
> size-in-bits='64' id='type-id-1106'/>
>      <pointer-type-def type-id='type-id-1105' size-in-bits='64'
> id='type-id-1107'/>
>      <qualified-type-def type-id='type-id-1107' const='yes'
> id='type-id-1108'/>
> @@ -2009,7 +2009,7 @@
>      <qualified-type-def type-id='type-id-83' const='yes'
> id='type-id-1473'/>
>      <pointer-type-def type-id='type-id-1473' size-in-bits='64'
> id='type-id-1474'/>
>      <qualified-type-def type-id='type-id-41' const='yes'
> id='type-id-1475'/>
> -    <qualified-type-def type-id='type-id-25' const='yes'
> id='type-id-1476'/>
> +    <qualified-type-def type-id='type-id-22' const='yes'
> id='type-id-1476'/>
>      <reference-type-def kind='lvalue' type-id='type-id-1476'
> size-in-bits='64' id='type-id-1477'/>
>      <qualified-type-def type-id='type-id-50' const='yes'
> id='type-id-1478'/>
>      <reference-type-def kind='lvalue' type-id='type-id-1478'
> size-in-bits='64' id='type-id-1479'/>
> @@ -2018,16 +2018,16 @@
>      <qualified-type-def type-id='type-id-57' const='yes'
> id='type-id-1482'/>
>      <pointer-type-def type-id='type-id-1482' size-in-bits='64'
> id='type-id-1483'/>
>      <pointer-type-def type-id='type-id-1483' size-in-bits='64'
> id='type-id-1484'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-27'
> size-in-bits='64' id='type-id-1485'/>
> -    <pointer-type-def type-id='type-id-27' size-in-bits='64'
> id='type-id-1486'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-1485'/>
> +    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-1486'/>
>      <pointer-type-def type-id='type-id-94' size-in-bits='64'
> id='type-id-1487'/>
>      <pointer-type-def type-id='type-id-1488' size-in-bits='64'
> id='type-id-86'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-29'
> size-in-bits='64' id='type-id-1489'/>
> -    <pointer-type-def type-id='type-id-29' size-in-bits='64'
> id='type-id-1490'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-26'
> size-in-bits='64' id='type-id-1489'/>
> +    <pointer-type-def type-id='type-id-26' size-in-bits='64'
> id='type-id-1490'/>
>      <pointer-type-def type-id='type-id-85' size-in-bits='64'
> id='type-id-1491'/>
> -    <pointer-type-def type-id='type-id-23' size-in-bits='64'
> id='type-id-1492'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-33'
> size-in-bits='64' id='type-id-1493'/>
> -    <pointer-type-def type-id='type-id-34' size-in-bits='64'
> id='type-id-1494'/>
> +    <pointer-type-def type-id='type-id-30' size-in-bits='64'
> id='type-id-1492'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-31'
> size-in-bits='64' id='type-id-1493'/>
> +    <pointer-type-def type-id='type-id-32' size-in-bits='64'
> id='type-id-1494'/>
>      <pointer-type-def type-id='type-id-80' size-in-bits='64'
> id='type-id-1495'/>
>      <pointer-type-def type-id='type-id-376' size-in-bits='64'
> id='type-id-1496'/>
>      <pointer-type-def type-id='type-id-379' size-in-bits='64'
> id='type-id-1497'/>
> @@ -2434,9 +2434,9 @@
>      <qualified-type-def type-id='type-id-1979' const='yes'
> id='type-id-1980'/>
>      <reference-type-def kind='lvalue' type-id='type-id-1980'
> size-in-bits='64' id='type-id-1981'/>
>      <reference-type-def kind='lvalue' type-id='type-id-1979'
> size-in-bits='64' id='type-id-1982'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-37'
> size-in-bits='64' id='type-id-1983'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-37'
> size-in-bits='64' id='type-id-1984'/>
> -    <pointer-type-def type-id='type-id-37' size-in-bits='64'
> id='type-id-1985'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-35'
> size-in-bits='64' id='type-id-1983'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-35'
> size-in-bits='64' id='type-id-1984'/>
> +    <pointer-type-def type-id='type-id-35' size-in-bits='64'
> id='type-id-1985'/>
>      <qualified-type-def type-id='type-id-1985' const='yes'
> id='type-id-1986'/>
>      <reference-type-def kind='lvalue' type-id='type-id-1986'
> size-in-bits='64' id='type-id-1987'/>
>      <reference-type-def kind='lvalue' type-id='type-id-1985'
> size-in-bits='64' id='type-id-1988'/>
> @@ -2597,16 +2597,16 @@
>      <reference-type-def kind='rvalue' type-id='type-id-1465'
> size-in-bits='64' id='type-id-2166'/>
>      <pointer-type-def type-id='type-id-62' size-in-bits='64'
> id='type-id-2167'/>
>      <pointer-type-def type-id='type-id-83' size-in-bits='64'
> id='type-id-2168'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-2169'/>
> +    <pointer-type-def type-id='type-id-21' size-in-bits='64'
> id='type-id-2169'/>
>      <pointer-type-def type-id='type-id-66' size-in-bits='64'
> id='type-id-2170'/>
>      <reference-type-def kind='lvalue' type-id='type-id-44'
> size-in-bits='64' id='type-id-2171'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-25'
> size-in-bits='64' id='type-id-2172'/>
> -    <pointer-type-def type-id='type-id-25' size-in-bits='64'
> id='type-id-2173'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-22'
> size-in-bits='64' id='type-id-2172'/>
> +    <pointer-type-def type-id='type-id-22' size-in-bits='64'
> id='type-id-2173'/>
>      <reference-type-def kind='lvalue' type-id='type-id-50'
> size-in-bits='64' id='type-id-2174'/>
>      <pointer-type-def type-id='type-id-50' size-in-bits='64'
> id='type-id-2175'/>
>      <pointer-type-def type-id='type-id-2176' size-in-bits='64'
> id='type-id-2177'/>
> -    <pointer-type-def type-id='type-id-2178' size-in-bits='64'
> id='type-id-22'/>
> -    <pointer-type-def type-id='type-id-56' size-in-bits='64'
> id='type-id-26'/>
> +    <pointer-type-def type-id='type-id-2178' size-in-bits='64'
> id='type-id-39'/>
> +    <pointer-type-def type-id='type-id-56' size-in-bits='64'
> id='type-id-23'/>
>      <pointer-type-def type-id='type-id-57' size-in-bits='64'
> id='type-id-2179'/>
>      <pointer-type-def type-id='type-id-2179' size-in-bits='64'
> id='type-id-2180'/>
>      <namespace-decl name='std'>
> @@ -2657,7 +2657,7 @@
>            <base-class access='public' layout-offset-in-bits='0'
> type-id='type-id-955'/>
>            <base-class access='private' layout-offset-in-bits='0'
> type-id='type-id-984'/>
>            <member-type access='public'>
> -            <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1652'
> column='1' id='type-id-2181'/>
> +            <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1652'
> column='1' id='type-id-2181'/>
>            </member-type>
>            <member-type access='public'>
>              <typedef-decl name='value_type' type-id='type-id-1294'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1653'
> column='1' id='type-id-2182'/>
> @@ -3096,13 +3096,13 @@
>            <member-function access='public' const='yes'>
>              <function-decl name='max_load_factor'
> mangled-name='_ZNKSt8__detail12_Rehash_baseISsSt4pairIKSsPN5mongo6logger9LogDomainINS4_21MessageEventEphemeralEEEESaIS9_ENS_10_Select1stESt8equal_toISsESt4hashISsENS_18_Mod_range_hashingENS_20_Default_ranged_hashENS_20_Prime_rehash_policyENS_17_Hashtable_traitsILb1ELb0ELb1EEEE15max_load_factorEv'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='948'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1015' is-artificial='yes'/>
> -              <return type-id='type-id-28'/>
> +              <return type-id='type-id-25'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='max_load_factor'
> mangled-name='_ZNSt8__detail12_Rehash_baseISsSt4pairIKSsPN5mongo6logger9LogDomainINS4_21MessageEventEphemeralEEEESaIS9_ENS_10_Select1stESt8equal_toISsESt4hashISsENS_18_Mod_range_hashingENS_20_Default_ranged_hashENS_20_Prime_rehash_policyENS_17_Hashtable_traitsILb1ELb0ELb1EEEE15max_load_factorEf'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='955'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1887' is-artificial='yes'/>
> -              <parameter type-id='type-id-28'/>
> +              <parameter type-id='type-id-25'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -3225,7 +3225,7 @@
>              <var-decl name='_S_growth_factor' type-id='type-id-1335'
> visibility='default'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='503'
> column='1'/>
>            </data-member>
>            <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='_M_max_load_factor' type-id='type-id-28'
> visibility='default'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='505'
> column='1'/>
> +            <var-decl name='_M_max_load_factor' type-id='type-id-25'
> visibility='default'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='505'
> column='1'/>
>            </data-member>
>            <data-member access='public' layout-offset-in-bits='64'>
>              <var-decl name='_M_next_resize' type-id='type-id-1334'
> visibility='default'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='506'
> column='1'/>
> @@ -3233,14 +3233,14 @@
>            <member-function access='public' constructor='yes'>
>              <function-decl name='_Prime_rehash_policy'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='463'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1886' is-artificial='yes'/>
> -              <parameter type-id='type-id-28'/>
> +              <parameter type-id='type-id-25'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
>              <function-decl name='max_load_factor'
> mangled-name='_ZNKSt8__detail20_Prime_rehash_policy15max_load_factorEv'
> filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='467'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1012' is-artificial='yes'/>
> -              <return type-id='type-id-28'/>
> +              <return type-id='type-id-25'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
> @@ -3368,7 +3368,7 @@
>          </class-decl>
>          <class-decl name='duration&lt;long int, std::ratio&lt;1l,
> 1000000000l&gt; &gt;' size-in-bits='64' is-struct='yes'
> visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241'
> column='1' id='type-id-1118'>
>            <member-type access='public'>
> -            <typedef-decl name='rep' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/chrono' line='243' column='1'
> id='type-id-1122'/>
> +            <typedef-decl name='rep' type-id='type-id-30'
> filepath='/usr/include/c++/4.9/chrono' line='243' column='1'
> id='type-id-1122'/>
>            </member-type>
>            <data-member access='private' layout-offset-in-bits='0'>
>              <var-decl name='__r' type-id='type-id-1122'
> visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373'
> column='1'/>
> @@ -3389,7 +3389,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~duration'
> filepath='/usr/include/c++/4.9/chrono' line='273' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1994' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -3427,7 +3427,7 @@
>            <member-function access='public'>
>              <function-decl name='operator++'
> mangled-name='_ZNSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEppEi'
> filepath='/usr/include/c++/4.9/chrono' line='298' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1994' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-1118'/>
>              </function-decl>
>            </member-function>
> @@ -3440,7 +3440,7 @@
>            <member-function access='public'>
>              <function-decl name='operator--'
> mangled-name='_ZNSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEmmEi'
> filepath='/usr/include/c++/4.9/chrono' line='309' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1994' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-1118'/>
>              </function-decl>
>            </member-function>
> @@ -3490,7 +3490,7 @@
>          </class-decl>
>          <class-decl name='duration&lt;long int, std::ratio&lt;1l,
> 1000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/chrono' line='241' column='1'
> id='type-id-1125'>
>            <member-type access='public'>
> -            <typedef-decl name='rep' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/chrono' line='243' column='1'
> id='type-id-1129'/>
> +            <typedef-decl name='rep' type-id='type-id-30'
> filepath='/usr/include/c++/4.9/chrono' line='243' column='1'
> id='type-id-1129'/>
>            </member-type>
>            <data-member access='private' layout-offset-in-bits='0'>
>              <var-decl name='__r' type-id='type-id-1129'
> visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373'
> column='1'/>
> @@ -3511,7 +3511,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~duration'
> filepath='/usr/include/c++/4.9/chrono' line='273' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1996' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -3549,7 +3549,7 @@
>            <member-function access='public'>
>              <function-decl name='operator++'
> mangled-name='_ZNSt6chrono8durationIlSt5ratioILl1ELl1000EEEppEi'
> filepath='/usr/include/c++/4.9/chrono' line='298' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1996' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-1125'/>
>              </function-decl>
>            </member-function>
> @@ -3562,7 +3562,7 @@
>            <member-function access='public'>
>              <function-decl name='operator--'
> mangled-name='_ZNSt6chrono8durationIlSt5ratioILl1ELl1000EEEmmEi'
> filepath='/usr/include/c++/4.9/chrono' line='309' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1996' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-1125'/>
>              </function-decl>
>            </member-function>
> @@ -3613,7 +3613,7 @@
>          <typedef-decl name='milliseconds' type-id='type-id-1125'
> filepath='/usr/include/c++/4.9/chrono' line='533' column='1'
> id='type-id-2209'/>
>          <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt;
> &gt;' size-in-bits='64' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/chrono' line='241' column='1'
> id='type-id-1132'>
>            <member-type access='public'>
> -            <typedef-decl name='rep' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/chrono' line='243' column='1'
> id='type-id-1136'/>
> +            <typedef-decl name='rep' type-id='type-id-30'
> filepath='/usr/include/c++/4.9/chrono' line='243' column='1'
> id='type-id-1136'/>
>            </member-type>
>            <data-member access='private' layout-offset-in-bits='0'>
>              <var-decl name='__r' type-id='type-id-1136'
> visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373'
> column='1'/>
> @@ -3634,7 +3634,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~duration'
> filepath='/usr/include/c++/4.9/chrono' line='273' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1998' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -3672,7 +3672,7 @@
>            <member-function access='public'>
>              <function-decl name='operator++'
> mangled-name='_ZNSt6chrono8durationIlSt5ratioILl1ELl1EEEppEi'
> filepath='/usr/include/c++/4.9/chrono' line='298' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1998' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-1132'/>
>              </function-decl>
>            </member-function>
> @@ -3685,7 +3685,7 @@
>            <member-function access='public'>
>              <function-decl name='operator--'
> mangled-name='_ZNSt6chrono8durationIlSt5ratioILl1ELl1EEEmmEi'
> filepath='/usr/include/c++/4.9/chrono' line='309' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1998' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-1132'/>
>              </function-decl>
>            </member-function>
> @@ -3750,7 +3750,7 @@
>          <parameter type-id='type-id-2211'/>
>          <return type-id='type-id-2211'/>
>        </function-decl>
> -      <class-decl name='basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='64' visibility='default'
> filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1'
> id='type-id-37'>
> +      <class-decl name='basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='64' visibility='default'
> filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1'
> id='type-id-35'>
>          <member-type access='private'>
>            <class-decl name='_Alloc_hider' size-in-bits='64'
> is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1'
> id='type-id-1989'>
>              <base-class access='public' layout-offset-in-bits='0'
> type-id='type-id-1042'/>
> @@ -4039,7 +4039,7 @@
>            <function-decl name='_S_compare'
> mangled-name='_ZNSs10_S_compareEmm'
> filepath='/usr/include/c++/4.9/bits/basic_string.h' line='412' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1113'/>
>              <parameter type-id='type-id-1113'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
> @@ -4145,7 +4145,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~basic_string'
> filepath='/usr/include/c++/4.9/bits/basic_string.h' line='546' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1985' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -5013,14 +5013,14 @@
>              <parameter type-id='type-id-1107' is-artificial='yes'/>
>              <parameter type-id='type-id-1113'/>
>              <parameter type-id='type-id-1113'/>
> -            <return type-id='type-id-37'/>
> +            <return type-id='type-id-35'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='compare'
> mangled-name='_ZNKSs7compareERKSs'
> filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2244' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1107' is-artificial='yes'/>
>              <parameter type-id='type-id-1106'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -5029,7 +5029,7 @@
>              <parameter type-id='type-id-1113'/>
>              <parameter type-id='type-id-1113'/>
>              <parameter type-id='type-id-1106'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -5040,14 +5040,14 @@
>              <parameter type-id='type-id-1106'/>
>              <parameter type-id='type-id-1113'/>
>              <parameter type-id='type-id-1113'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='compare' mangled-name='_ZNKSs7compareEPKc'
> filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2320' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1107' is-artificial='yes'/>
>              <parameter type-id='type-id-84'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -5056,7 +5056,7 @@
>              <parameter type-id='type-id-1113'/>
>              <parameter type-id='type-id-1113'/>
>              <parameter type-id='type-id-84'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -5066,7 +5066,7 @@
>              <parameter type-id='type-id-1113'/>
>              <parameter type-id='type-id-84'/>
>              <parameter type-id='type-id-1113'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -5097,7 +5097,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1923' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -5113,10 +5113,10 @@
>            <typedef-decl name='reference' type-id='type-id-1106'
> filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192'
> column='1' id='type-id-2229'/>
>          </member-type>
>        </class-decl>
> -      <typedef-decl name='ptrdiff_t' type-id='type-id-23'
> filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h'
> line='189' column='1' id='type-id-2227'/>
> +      <typedef-decl name='ptrdiff_t' type-id='type-id-30'
> filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h'
> line='189' column='1' id='type-id-2227'/>
>        <class-decl name='iterator_traits&lt;std::basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175'
> column='1' id='type-id-2230'>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='178'
> column='1' id='type-id-2231'/>
> +          <typedef-decl name='value_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='178'
> column='1' id='type-id-2231'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179'
> column='1' id='type-id-2232'/>
> @@ -5213,7 +5213,7 @@
>        </function-decl>
>        <class-decl name='remove_reference&lt;std::basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;&amp;&gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1'
> id='type-id-2247'>
>          <member-type access='public'>
> -          <typedef-decl name='type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1'
> id='type-id-2084'/>
> +          <typedef-decl name='type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1'
> id='type-id-2084'/>
>          </member-type>
>        </class-decl>
>        <function-decl
> name='move&lt;std::basic_string&lt;char&gt;&amp;&gt;'
> mangled-name='_ZSt4moveIRSsEONSt16remove_referenceIT_E4typeEOS2_'
> filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZSt4moveIRSsEONSt16remove_referenceIT_E4typeEOS2_'>
> @@ -5223,7 +5223,7 @@
>        <function-decl name='operator+&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> mangled-name='_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_OS6_'
> filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2455' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_OS6_'>
>          <parameter type-id='type-id-1106'/>
>          <parameter type-id='type-id-1984'/>
> -        <return type-id='type-id-37'/>
> +        <return type-id='type-id-35'/>
>        </function-decl>
>        <class-decl name='__add_ref&lt;mongo::BSONObjBuilder*&gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/tuple' line='62' column='1'
> id='type-id-2248'>
>          <member-type access='public'>
> @@ -5333,7 +5333,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2147' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -5866,7 +5866,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1806' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -5927,7 +5927,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1926' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -6055,7 +6055,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2285'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2279'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2279'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPPN5mongo6logger8AppenderINS1_21MessageEventEphemeralEEEE10pointer_toERS5_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -6127,12 +6127,12 @@
>          </member-function>
>        </class-decl>
>        <typedef-decl name='true_type' type-id='type-id-1180'
> filepath='/usr/include/c++/4.9/type_traits' line='87' column='1'
> id='type-id-2266'/>
> -      <typedef-decl name='string' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='62' column='1'
> id='type-id-1336'/>
> +      <typedef-decl name='string' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='62' column='1'
> id='type-id-1336'/>
>        <class-decl
> name='unique_ptr&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;,
> std::default_delete&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;
> &gt; &gt;' visibility='default' is-declaration-only='yes'
> id='type-id-2300'/>
>        <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32'
> is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/atomic'
> line='617' column='1' id='type-id-1102'>
>          <base-class access='public' layout-offset-in-bits='0'
> type-id='type-id-942'/>
>          <member-type access='public'>
> -          <typedef-decl name='__integral_type' type-id='type-id-25'
> filepath='/usr/include/c++/4.9/atomic' line='619' column='1'
> id='type-id-2301'/>
> +          <typedef-decl name='__integral_type' type-id='type-id-22'
> filepath='/usr/include/c++/4.9/atomic' line='619' column='1'
> id='type-id-2301'/>
>          </member-type>
>          <member-function access='public'>
>            <function-decl name='atomic'
> filepath='/usr/include/c++/4.9/atomic' line='622' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -6143,7 +6143,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~atomic'
> filepath='/usr/include/c++/4.9/atomic' line='623' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1976' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -6171,7 +6171,7 @@
>        </class-decl>
>        <class-decl name='__atomic_base&lt;unsigned int&gt;'
> size-in-bits='32' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='353' column='1'
> id='type-id-942'>
>          <member-type access='private'>
> -          <typedef-decl name='__int_type' type-id='type-id-25'
> filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='356' column='1'
> id='type-id-1842'/>
> +          <typedef-decl name='__int_type' type-id='type-id-22'
> filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='356' column='1'
> id='type-id-1842'/>
>          </member-type>
>          <data-member access='private' layout-offset-in-bits='0'>
>            <var-decl name='_M_i' type-id='type-id-1842'
> visibility='default' filepath='/usr/include/c++/4.9/bits/atomic_base.h'
> line='358' column='1'/>
> @@ -6185,7 +6185,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~__atomic_base'
> filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='362' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1841' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -6226,14 +6226,14 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt13__atomic_baseIjEppEi'
> filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='391' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1841' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1842'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZNSt13__atomic_baseIjEmmEi'
> filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='399' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1841' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1842'/>
>            </function-decl>
>          </member-function>
> @@ -7014,7 +7014,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_List_base'
> filepath='/usr/include/c++/4.9/bits/stl_list.h' line='386' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1700' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -7033,7 +7033,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_List_base'
> mangled-name='_ZNSt10_List_baseIN5mongo17optionenvironment13OptionSectionESaIS2_EED2Ev'
> filepath='/usr/include/c++/4.9/bits/stl_list.h' line='386' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt10_List_baseIN5mongo17optionenvironment13OptionSectionESaIS2_EED1Ev'>
>              <parameter type-id='type-id-1700' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -7062,14 +7062,14 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1934' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> mangled-name='_ZNSaISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEED2Ev'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSaISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEED2Ev'>
>              <parameter type-id='type-id-1934' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -7124,7 +7124,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1932' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -7746,7 +7746,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_List_base'
> filepath='/usr/include/c++/4.9/bits/stl_list.h' line='386' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1694' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -7765,7 +7765,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_List_base'
> mangled-name='_ZNSt10_List_baseIN5mongo17optionenvironment17OptionDescriptionESaIS2_EED2Ev'
> filepath='/usr/include/c++/4.9/bits/stl_list.h' line='386' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt10_List_baseIN5mongo17optionenvironment17OptionDescriptionESaIS2_EED1Ev'>
>              <parameter type-id='type-id-1694' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -7794,14 +7794,14 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1933' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> mangled-name='_ZNSaISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEED2Ev'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSaISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEED1Ev'>
>              <parameter type-id='type-id-1933' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -7821,7 +7821,7 @@
>        <class-decl name='vector&lt;std::basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;,
> std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;,
> std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192'
> visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h'
> line='214' column='1' id='type-id-1446'>
>          <base-class access='protected' layout-offset-in-bits='0'
> type-id='type-id-924'/>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1'
> id='type-id-1455'/>
> +          <typedef-decl name='value_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1'
> id='type-id-1455'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='pointer' type-id='type-id-2343'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1'
> id='type-id-2342'/>
> @@ -7921,7 +7921,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2161' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -8360,7 +8360,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> mangled-name='_ZNSt6vectorISsSaISsEED2Ev'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorISsSaISsEED1Ev'>
>              <parameter type-id='type-id-2161' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -8510,7 +8510,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1827' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -8545,7 +8545,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> mangled-name='_ZNSt12_Vector_baseISsSaISsEED2Ev'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt12_Vector_baseISsSaISsEED1Ev'>
>              <parameter type-id='type-id-1827' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -8566,7 +8566,7 @@
>            <typedef-decl name='pointer' type-id='type-id-1985'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1'
> id='type-id-2357'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1'
> id='type-id-2358'/>
> +          <typedef-decl name='value_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1'
> id='type-id-2358'/>
>          </member-type>
>          <member-type access='public'>
>            <class-decl name='rebind&lt;std::basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1'
> id='type-id-2359'>
> @@ -8598,14 +8598,14 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1943' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator' mangled-name='_ZNSaISsED2Ev'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSaISsED1Ev'>
>              <parameter type-id='type-id-1943' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -8641,7 +8641,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1935' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -8794,7 +8794,7 @@
>          <member-function access='private' static='yes'>
>            <function-decl name='_S_max_size&lt;const
> std::allocator&lt;std::basic_string&lt;char&gt; &gt;, void&gt;'
> mangled-name='_ZNSt16allocator_traitsISaISsEE11_S_max_sizeIKS0_vEEmRT_i'
> filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='308' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt16allocator_traitsISaISsEE11_S_max_sizeIKS0_vEEmRT_i'>
>              <parameter type-id='type-id-1086'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-2370'/>
>            </function-decl>
>          </member-function>
> @@ -8807,7 +8807,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2373'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2367'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2367'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPSsE10pointer_toERSs'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -8818,7 +8818,7 @@
>        </class-decl>
>        <class-decl name='__ptrtr_not_void&lt;std::basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;,
> std::basic_string&lt;char, std::char_traits&lt;char&gt;,
> std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes'
> visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h'
> line='105' column='1' id='type-id-2376'>
>          <member-type access='public'>
> -          <typedef-decl name='__type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1'
> id='type-id-1901'/>
> +          <typedef-decl name='__type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1'
> id='type-id-1901'/>
>          </member-type>
>        </class-decl>
>        <class-decl
> name='__alloctr_rebind&lt;std::allocator&lt;std::basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;,
> std::basic_string&lt;char, std::char_traits&lt;char&gt;,
> std::allocator&lt;char&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes'
> visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h'
> line='63' column='1' id='type-id-2377'>
> @@ -8887,10 +8887,10 @@
>            <typedef-decl name='_Rep_type' type-id='type-id-789'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1'
> id='type-id-2383'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1'
> id='type-id-1272'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1'
> id='type-id-1272'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='mapped_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1'
> id='type-id-1275'/>
> +          <typedef-decl name='mapped_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1'
> id='type-id-1275'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='value_type' type-id='type-id-1302'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='101' column='1'
> id='type-id-1278'/>
> @@ -9343,7 +9343,7 @@
>            <typedef-decl name='_Const_Base_ptr' type-id='type-id-838'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1'
> id='type-id-2400'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1'
> id='type-id-799'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1'
> id='type-id-799'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='value_type' type-id='type-id-1302'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1'
> id='type-id-802'/>
> @@ -9719,7 +9719,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Rb_tree'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='714' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1738' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -9962,7 +9962,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Rb_tree'
> mangled-name='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EED2Ev'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='714' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EED1Ev'>
>              <parameter type-id='type-id-1738' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -10000,14 +10000,14 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1939' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> mangled-name='_ZNSaISt13_Rb_tree_nodeISt4pairIKSsSsEEED2Ev'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSaISt13_Rb_tree_nodeISt4pairIKSsSsEEED1Ev'>
>              <parameter type-id='type-id-1939' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -10108,7 +10108,7 @@
>            <var-decl name='first' type-id='type-id-1105'
> visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h'
> line='101' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='64'>
> -          <var-decl name='second' type-id='type-id-37'
> visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h'
> line='102' column='1'/>
> +          <var-decl name='second' type-id='type-id-35'
> visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h'
> line='102' column='1'/>
>          </data-member>
>          <member-function access='public'>
>            <function-decl name='pair'
> filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='108' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -10321,7 +10321,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1950' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -10334,7 +10334,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2430'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2423'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2423'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPSt4pairIKSsSsEE10pointer_toERS2_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -10406,7 +10406,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSsSsEEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='208' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt17_Rb_tree_iteratorISt4pairIKSsSsEEppEi'>
>              <parameter type-id='type-id-1747' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-817'/>
>            </function-decl>
>          </member-function>
> @@ -10419,7 +10419,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSsSsEEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='223' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1747' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-817'/>
>            </function-decl>
>          </member-function>
> @@ -10514,7 +10514,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKSsSsEEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='288' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1745' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-808'/>
>            </function-decl>
>          </member-function>
> @@ -10527,7 +10527,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKSsSsEEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='303' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1745' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-808'/>
>            </function-decl>
>          </member-function>
> @@ -10761,7 +10761,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2165' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -11171,7 +11171,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> mangled-name='_ZNSt6vectorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEESaIS4_EED2Ev'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEESaIS4_EED1Ev'>
>              <parameter type-id='type-id-2165' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -11301,7 +11301,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1834' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -11330,7 +11330,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> mangled-name='_ZNSt12_Vector_baseISt10shared_ptrIN5mongo17optionenvironment10ConstraintEESaIS4_EED2Ev'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt12_Vector_baseISt10shared_ptrIN5mongo17optionenvironment10ConstraintEESaIS4_EED1Ev'>
>              <parameter type-id='type-id-1834' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -11369,14 +11369,14 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1952' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> mangled-name='_ZNSaISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEED2Ev'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSaISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEED1Ev'>
>              <parameter type-id='type-id-1952' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -11456,7 +11456,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~__shared_ptr'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='914'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1915' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -11513,7 +11513,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='use_count'
> mangled-name='_ZNKSt12__shared_ptrIN5mongo17optionenvironment10ConstraintELN9__gnu_cxx12_Lock_policyE2EE9use_countEv'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='1063'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1026' is-artificial='yes'/>
> -            <return type-id='type-id-23'/>
> +            <return type-id='type-id-30'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
> @@ -11535,13 +11535,13 @@
>            <function-decl name='_M_get_deleter'
> mangled-name='_ZNKSt12__shared_ptrIN5mongo17optionenvironment10ConstraintELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='1155'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1026' is-artificial='yes'/>
>              <parameter type-id='type-id-1350'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~__shared_ptr'
> mangled-name='_ZNSt12__shared_ptrIN5mongo17optionenvironment10ConstraintELN9__gnu_cxx12_Lock_policyE2EED2Ev'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='914'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt12__shared_ptrIN5mongo17optionenvironment10ConstraintELN9__gnu_cxx12_Lock_policyE2EED1Ev'>
>              <parameter type-id='type-id-1915' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -11649,7 +11649,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2151' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -12182,7 +12182,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1813' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -12243,7 +12243,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1928' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -12371,7 +12371,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2506'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2500'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2500'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPPN5mongo17optionenvironment10ConstraintEE10pointer_toERS3_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -12496,7 +12496,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2155' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -13029,7 +13029,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1820' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -13090,7 +13090,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1930' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -13218,7 +13218,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2544'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2538'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2538'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPPN5mongo17optionenvironment13KeyConstraintEE10pointer_toERS3_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -13245,7 +13245,7 @@
>            <typedef-decl name='_Rep_type' type-id='type-id-773'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1'
> id='type-id-2549'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1'
> id='type-id-1256'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1'
> id='type-id-1256'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='mapped_type' type-id='type-id-586'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1'
> id='type-id-1259'/>
> @@ -13689,7 +13689,7 @@
>            <typedef-decl name='_Const_Base_ptr' type-id='type-id-838'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1'
> id='type-id-2567'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1'
> id='type-id-783'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1'
> id='type-id-783'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='value_type' type-id='type-id-1298'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1'
> id='type-id-786'/>
> @@ -14065,7 +14065,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Rb_tree'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='714' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1729' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -14324,7 +14324,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1937' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -14568,7 +14568,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1948' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -14581,7 +14581,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2591'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2584'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2584'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPSt4pairIKSsN5mongo17optionenvironment5ValueEEE10pointer_toERS5_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -14613,10 +14613,10 @@
>            <typedef-decl name='_Rep_type' type-id='type-id-741'
> filepath='/usr/include/c++/4.9/bits/stl_set.h' line='115' column='1'
> id='type-id-2598'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_set.h' line='103' column='1'
> id='type-id-1324'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_set.h' line='103' column='1'
> id='type-id-1324'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_set.h' line='104' column='1'
> id='type-id-1327'/>
> +          <typedef-decl name='value_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_set.h' line='104' column='1'
> id='type-id-1327'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='key_compare' type-id='type-id-1209'
> filepath='/usr/include/c++/4.9/bits/stl_set.h' line='105' column='1'
> id='type-id-2599'/>
> @@ -15007,10 +15007,10 @@
>            <typedef-decl name='_Const_Base_ptr' type-id='type-id-838'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1'
> id='type-id-2611'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1'
> id='type-id-751'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1'
> id='type-id-751'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1'
> id='type-id-754'/>
> +          <typedef-decl name='value_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1'
> id='type-id-754'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='const_reference' type-id='type-id-756'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1'
> id='type-id-2612'/>
> @@ -15383,7 +15383,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Rb_tree'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='714' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1711' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -15860,7 +15860,7 @@
>        </class-decl>
>        <class-decl name='_Head_base&lt;1ul, unsigned int, false&gt;'
> size-in-bits='32' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/tuple' line='129' column='1'
> id='type-id-718'>
>          <data-member access='public' layout-offset-in-bits='0'>
> -          <var-decl name='_M_head_impl' type-id='type-id-25'
> visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174'
> column='1'/>
> +          <var-decl name='_M_head_impl' type-id='type-id-22'
> visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174'
> column='1'/>
>          </data-member>
>          <member-function access='public'>
>            <function-decl name='_Head_base'
> filepath='/usr/include/c++/4.9/tuple' line='131' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -15931,7 +15931,7 @@
>        <class-decl name='__uses_alloc_base' size-in-bits='8'
> is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/bits/uses_allocator.h' line='68' column='1'
> id='type-id-2624'/>
>        <class-decl name='_Head_base&lt;0ul, unsigned int, false&gt;'
> size-in-bits='32' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/tuple' line='129' column='1'
> id='type-id-709'>
>          <data-member access='public' layout-offset-in-bits='0'>
> -          <var-decl name='_M_head_impl' type-id='type-id-25'
> visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174'
> column='1'/>
> +          <var-decl name='_M_head_impl' type-id='type-id-22'
> visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174'
> column='1'/>
>          </data-member>
>          <member-function access='public'>
>            <function-decl name='_Head_base'
> filepath='/usr/include/c++/4.9/tuple' line='131' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -16012,7 +16012,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~__shared_count'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='663'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1912' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -16040,7 +16040,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='_M_get_use_count'
> mangled-name='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE16_M_get_use_countEv'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='700'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1022' is-artificial='yes'/>
> -            <return type-id='type-id-23'/>
> +            <return type-id='type-id-30'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -16053,7 +16053,7 @@
>            <function-decl name='_M_get_deleter'
> mangled-name='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='708'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1022' is-artificial='yes'/>
>              <parameter type-id='type-id-1350'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -16073,7 +16073,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~__shared_count'
> mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='663'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED1Ev'>
>              <parameter type-id='type-id-1912' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -16131,7 +16131,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='_M_get_use_count'
> mangled-name='_ZNKSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE16_M_get_use_countEv'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='195'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-842' is-artificial='yes'/>
> -            <return type-id='type-id-23'/>
> +            <return type-id='type-id-30'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
> @@ -16151,7 +16151,7 @@
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~_Sp_counted_base'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='115'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1761' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -16171,7 +16171,7 @@
>            <function-decl name='_M_get_deleter'
> mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'
> filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='129'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1761' is-artificial='yes'/>
>              <parameter type-id='type-id-1350'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -16315,7 +16315,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2640'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2634'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2634'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPSt10shared_ptrIN5mongo17optionenvironment10ConstraintEEE10pointer_toERS4_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -16375,7 +16375,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1931' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -16488,7 +16488,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2137' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -17021,7 +17021,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1792' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -17082,7 +17082,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1920' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -17210,7 +17210,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2680'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2674'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2674'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPN5boost10shared_ptrINS0_15program_options18option_descriptionEEEE10pointer_toERS4_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -17319,7 +17319,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='629' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2134' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -17790,7 +17790,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Bvector_base'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='473' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1658' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -17832,7 +17832,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1924' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -17858,7 +17858,7 @@
>            <function-decl name='_Bit_iterator'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='222' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1649' is-artificial='yes'/>
>              <parameter type-id='type-id-1656'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -17883,7 +17883,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt13_Bit_iteratorppEi'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='241' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1649' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1650'/>
>            </function-decl>
>          </member-function>
> @@ -17896,7 +17896,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZNSt13_Bit_iteratormmEi'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='256' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1649' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1650'/>
>            </function-decl>
>          </member-function>
> @@ -17942,13 +17942,13 @@
>            <var-decl name='_M_p' type-id='type-id-1656'
> visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h'
> line='139' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='64'>
> -          <var-decl name='_M_offset' type-id='type-id-25'
> visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h'
> line='140' column='1'/>
> +          <var-decl name='_M_offset' type-id='type-id-22'
> visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h'
> line='140' column='1'/>
>          </data-member>
>          <member-function access='public' constructor='yes'>
>            <function-decl name='_Bit_iterator_base'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='142' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1652' is-artificial='yes'/>
>              <parameter type-id='type-id-1656'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -18016,7 +18016,7 @@
>        </class-decl>
>        <class-decl name='iterator&lt;std::random_access_iterator_tag,
> bool, long int, bool*, bool&amp;&gt;' size-in-bits='8' is-struct='yes'
> visibility='default'
> filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='118'
> column='1' id='type-id-2696'>
>          <member-type access='public'>
> -          <typedef-decl name='difference_type' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='125'
> column='1' id='type-id-2695'/>
> +          <typedef-decl name='difference_type' type-id='type-id-30'
> filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='125'
> column='1' id='type-id-2695'/>
>          </member-type>
>        </class-decl>
>        <typedef-decl name='_Bit_type' type-id='type-id-50'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='67' column='1'
> id='type-id-1655'/>
> @@ -18107,7 +18107,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1918' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -18136,7 +18136,7 @@
>            <function-decl name='_Bit_const_iterator'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='309' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1646' is-artificial='yes'/>
>              <parameter type-id='type-id-1656'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -18168,7 +18168,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt19_Bit_const_iteratorppEi'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='331' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1646' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1647'/>
>            </function-decl>
>          </member-function>
> @@ -18181,7 +18181,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZNSt19_Bit_const_iteratormmEi'
> filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='346' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1646' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1647'/>
>            </function-decl>
>          </member-function>
> @@ -18285,7 +18285,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt16reverse_iteratorISt19_Bit_const_iteratorEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='194' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2096' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1309'/>
>            </function-decl>
>          </member-function>
> @@ -18298,7 +18298,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZNSt16reverse_iteratorISt19_Bit_const_iteratorEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='219' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2096' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1309'/>
>            </function-decl>
>          </member-function>
> @@ -18414,7 +18414,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt16reverse_iteratorISt13_Bit_iteratorEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='194' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2098' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1313'/>
>            </function-decl>
>          </member-function>
> @@ -18427,7 +18427,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZNSt16reverse_iteratorISt13_Bit_iteratorEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='219' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2098' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1313'/>
>            </function-decl>
>          </member-function>
> @@ -18631,7 +18631,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~vector'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='423' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2141' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -19164,7 +19164,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Vector_base'
> filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1799' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -19225,7 +19225,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1922' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -19353,7 +19353,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2755'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2749'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2749'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPN5boost10shared_ptrINS0_15program_options19options_descriptionEEEE10pointer_toERS4_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -19437,7 +19437,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~unique_ptr'
> filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='232' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2121' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -19527,7 +19527,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~unique_ptr'
> mangled-name='_ZNSt10unique_ptrIN5mongo14BSONObjBuilderESt14default_deleteIS1_EED2Ev'
> filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='232' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt10unique_ptrIN5mongo14BSONObjBuilderESt14default_deleteIS1_EED1Ev'>
>              <parameter type-id='type-id-2121' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -19885,7 +19885,7 @@
>        </function-decl>
>        <class-decl name='remove_reference&lt;std::basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1'
> id='type-id-2770'>
>          <member-type access='public'>
> -          <typedef-decl name='type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1'
> id='type-id-2082'/>
> +          <typedef-decl name='type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1'
> id='type-id-2082'/>
>          </member-type>
>        </class-decl>
>        <function-decl name='forward&lt;std::basic_string&lt;char&gt; &gt;'
> mangled-name='_ZSt7forwardISsEOT_RNSt16remove_referenceIS0_E4typeE'
> filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZSt7forwardISsEOT_RNSt16remove_referenceIS0_E4typeE'>
> @@ -20431,7 +20431,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt13move_iteratorIPSsEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='994' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2050' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1283'/>
>            </function-decl>
>          </member-function>
> @@ -20444,7 +20444,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZNSt13move_iteratorIPSsEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1009' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2050' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1283'/>
>            </function-decl>
>          </member-function>
> @@ -20709,13 +20709,13 @@
>          <member-function access='private'>
>            <function-decl name='_M_access'
> mangled-name='_ZNSt9_Any_data9_M_accessEv'
> filepath='/usr/include/c++/4.9/functional' line='1766' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt9_Any_data9_M_accessEv'>
>              <parameter type-id='type-id-1645' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' const='yes'>
>            <function-decl name='_M_access'
> mangled-name='_ZNKSt9_Any_data9_M_accessEv'
> filepath='/usr/include/c++/4.9/functional' line='1767' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNKSt9_Any_data9_M_accessEv'>
>              <parameter type-id='type-id-659' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
> @@ -20745,16 +20745,16 @@
>        </union-decl>
>        <union-decl name='_Nocopy_types' size-in-bits='128'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1756'
> column='1' id='type-id-2794'>
>          <data-member access='private'>
> -          <var-decl name='_M_object' type-id='type-id-26'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1758'
> column='1'/>
> +          <var-decl name='_M_object' type-id='type-id-23'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1758'
> column='1'/>
>          </data-member>
>          <data-member access='private'>
> -          <var-decl name='_M_const_object' type-id='type-id-26'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1759'
> column='1'/>
> +          <var-decl name='_M_const_object' type-id='type-id-23'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1759'
> column='1'/>
>          </data-member>
>          <data-member access='private'>
>            <var-decl name='_M_function_pointer' type-id='type-id-2177'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1760'
> column='1'/>
>          </data-member>
>          <data-member access='private'>
> -          <var-decl name='_M_member_pointer' type-id='type-id-21'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1761'
> column='1'/>
> +          <var-decl name='_M_member_pointer' type-id='type-id-38'
> visibility='default' filepath='/usr/include/c++/4.9/functional' line='1761'
> column='1'/>
>          </data-member>
>        </union-decl>
>        <class-decl name='_Undefined_class' visibility='default'
> is-declaration-only='yes' id='type-id-1789'/>
> @@ -20863,7 +20863,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Function_base'
> filepath='/usr/include/c++/4.9/functional' line='1995' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1663' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -20882,7 +20882,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Function_base'
> mangled-name='_ZNSt14_Function_baseD2Ev'
> filepath='/usr/include/c++/4.9/functional' line='1995' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNSt14_Function_baseD1Ev'>
>              <parameter type-id='type-id-1663' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -21283,19 +21283,19 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='load_factor'
> mangled-name='_ZNKSt13unordered_mapISsPN5mongo6logger9LogDomainINS1_21MessageEventEphemeralEEESt4hashISsESt8equal_toISsESaISt4pairIKSsS5_EEE11load_factorEv'
> filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='737' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1370' is-artificial='yes'/>
> -            <return type-id='type-id-28'/>
> +            <return type-id='type-id-25'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='max_load_factor'
> mangled-name='_ZNKSt13unordered_mapISsPN5mongo6logger9LogDomainINS1_21MessageEventEphemeralEEESt4hashISsESt8equal_toISsESaISt4pairIKSsS5_EEE15max_load_factorEv'
> filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='743' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1370' is-artificial='yes'/>
> -            <return type-id='type-id-28'/>
> +            <return type-id='type-id-25'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='max_load_factor'
> mangled-name='_ZNSt13unordered_mapISsPN5mongo6logger9LogDomainINS1_21MessageEventEphemeralEEESt4hashISsESt8equal_toISsESaISt4pairIKSsS5_EEE15max_load_factorEf'
> filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='751' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2129' is-artificial='yes'/>
> -            <parameter type-id='type-id-28'/>
> +            <parameter type-id='type-id-25'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -21337,7 +21337,7 @@
>            <typedef-decl name='__hashtable_alloc' type-id='type-id-968'
> filepath='/usr/include/c++/4.9/bits/hashtable.h' line='192' column='1'
> id='type-id-1669'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/hashtable.h' line='202' column='1'
> id='type-id-700'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/hashtable.h' line='202' column='1'
> id='type-id-700'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='value_type' type-id='type-id-1294'
> filepath='/usr/include/c++/4.9/bits/hashtable.h' line='203' column='1'
> id='type-id-2800'/>
> @@ -21554,7 +21554,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Hashtable'
> filepath='/usr/include/c++/4.9/bits/hashtable.h' line='1216' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1666' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -21702,7 +21702,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='load_factor'
> mangled-name='_ZNKSt10_HashtableISsSt4pairIKSsPN5mongo6logger9LogDomainINS3_21MessageEventEphemeralEEEESaIS8_ENSt8__detail10_Select1stESt8equal_toISsESt4hashISsENSA_18_Mod_range_hashingENSA_20_Default_ranged_hashENSA_20_Prime_rehash_policyENSA_17_Hashtable_traitsILb1ELb0ELb1EEEE11load_factorEv'
> filepath='/usr/include/c++/4.9/bits/hashtable.h' line='573' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-690' is-artificial='yes'/>
> -            <return type-id='type-id-28'/>
> +            <return type-id='type-id-25'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -22033,7 +22033,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1941' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -22113,7 +22113,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1946' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -22180,7 +22180,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~unique_ptr'
> filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='232' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2125' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -22301,7 +22301,7 @@
>              <member-function access='public' destructor='yes'>
>                <function-decl name='~Init'
> filepath='/usr/include/c++/4.9/bits/ios_base.h' line='538' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                  <parameter type-id='type-id-2021' is-artificial='yes'/>
> -                <parameter type-id='type-id-29' is-artificial='yes'/>
> +                <parameter type-id='type-id-26' is-artificial='yes'/>
>                  <return type-id='type-id-56'/>
>                </function-decl>
>              </member-function>
> @@ -22551,7 +22551,7 @@
>            <typedef-decl name='_Rep_type' type-id='type-id-757'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1'
> id='type-id-2834'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1'
> id='type-id-1240'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1'
> id='type-id-1240'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='mapped_type' type-id='type-id-1564'
> filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1'
> id='type-id-1243'/>
> @@ -22995,7 +22995,7 @@
>            <typedef-decl name='_Const_Base_ptr' type-id='type-id-838'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1'
> id='type-id-2852'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='key_type' type-id='type-id-37'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1'
> id='type-id-767'/>
> +          <typedef-decl name='key_type' type-id='type-id-35'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1'
> id='type-id-767'/>
>          </member-type>
>          <member-type access='public'>
>            <typedef-decl name='value_type' type-id='type-id-1290'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1'
> id='type-id-770'/>
> @@ -23371,7 +23371,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_Rb_tree'
> filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='714' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1720' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -23630,7 +23630,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1936' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -23785,7 +23785,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~allocator'
> filepath='/usr/include/c++/4.9/bits/allocator.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1945' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -23799,7 +23799,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2873'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2866'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2866'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPSt4pairIKSsPN5mongo15ServerParameterEEE10pointer_toERS5_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -23993,7 +23993,7 @@
>            <typedef-decl name='difference_type' type-id='type-id-2227'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1'
> id='type-id-2890'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='rebind' type-id='type-id-26'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2886'/>
> +          <typedef-decl name='rebind' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1'
> id='type-id-2886'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='pointer_to'
> mangled-name='_ZNSt14pointer_traitsIPSt13_Rb_tree_nodeISt4pairIKSsSsEEE10pointer_toERS4_'
> filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -24144,7 +24144,7 @@
>          <member-function access='public'>
>            <function-decl name='discard'
> mangled-name='_ZNSt23mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EE7discardEy'
> filepath='/usr/include/c++/4.9/bits/random.h' line='543' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-2048' is-artificial='yes'/>
> -            <parameter type-id='type-id-34'/>
> +            <parameter type-id='type-id-32'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -24171,7 +24171,7 @@
>        </class-decl>
>        <class-decl name='integral_constant&lt;long int, 1l&gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/type_traits' line='69' column='1'
> id='type-id-1192'>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/type_traits' line='72' column='1'
> id='type-id-2898'/>
> +          <typedef-decl name='value_type' type-id='type-id-30'
> filepath='/usr/include/c++/4.9/type_traits' line='72' column='1'
> id='type-id-2898'/>
>          </member-type>
>          <data-member access='public' static='yes'>
>            <var-decl name='value' type-id='type-id-371'
> mangled-name='_ZNSt17integral_constantIlLl1EE5valueE' visibility='default'
> filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
> @@ -24185,7 +24185,7 @@
>        </class-decl>
>        <class-decl name='integral_constant&lt;long int, 1000000000l&gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/type_traits' line='69' column='1'
> id='type-id-1183'>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/type_traits' line='72' column='1'
> id='type-id-2899'/>
> +          <typedef-decl name='value_type' type-id='type-id-30'
> filepath='/usr/include/c++/4.9/type_traits' line='72' column='1'
> id='type-id-2899'/>
>          </member-type>
>          <data-member access='public' static='yes'>
>            <var-decl name='value' type-id='type-id-371'
> mangled-name='_ZNSt17integral_constantIlLl1000000000EE5valueE'
> visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71'
> column='1'/>
> @@ -24223,7 +24223,7 @@
>        </class-decl>
>        <class-decl name='integral_constant&lt;long int, 1000l&gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/type_traits' line='69' column='1'
> id='type-id-1189'>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/type_traits' line='72' column='1'
> id='type-id-2903'/>
> +          <typedef-decl name='value_type' type-id='type-id-30'
> filepath='/usr/include/c++/4.9/type_traits' line='72' column='1'
> id='type-id-2903'/>
>          </member-type>
>          <data-member access='public' static='yes'>
>            <var-decl name='value' type-id='type-id-371'
> mangled-name='_ZNSt17integral_constantIlLl1000EE5valueE'
> visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71'
> column='1'/>
> @@ -24267,7 +24267,7 @@
>        </class-decl>
>        <class-decl name='integral_constant&lt;long int, 1000000l&gt;'
> size-in-bits='8' is-struct='yes' visibility='default'
> filepath='/usr/include/c++/4.9/type_traits' line='69' column='1'
> id='type-id-1186'>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-23'
> filepath='/usr/include/c++/4.9/type_traits' line='72' column='1'
> id='type-id-2907'/>
> +          <typedef-decl name='value_type' type-id='type-id-30'
> filepath='/usr/include/c++/4.9/type_traits' line='72' column='1'
> id='type-id-2907'/>
>          </member-type>
>          <data-member access='public' static='yes'>
>            <var-decl name='value' type-id='type-id-371'
> mangled-name='_ZNSt17integral_constantIlLl1000000EE5valueE'
> visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71'
> column='1'/>
> @@ -24282,8 +24282,8 @@
>      </namespace-decl>
>      <namespace-decl name='__gnu_cxx'>
>        <function-decl name='div' mangled-name='_ZN9__gnu_cxx3divExx'
> filepath='/usr/include/c++/4.9/cstdlib' line='214' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -        <parameter type-id='type-id-33'/>
> -        <parameter type-id='type-id-33'/>
> +        <parameter type-id='type-id-31'/>
> +        <parameter type-id='type-id-31'/>
>          <return type-id='type-id-59'/>
>        </function-decl>
>        <class-decl name='__normal_iterator&lt;const
> std::basic_string&lt;char, std::char_traits&lt;char&gt;,
> std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;,
> std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;,
> std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='64'
> visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h'
> line='709' column='1' id='type-id-132'>
> @@ -24336,7 +24336,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='756' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-134' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-132'/>
>            </function-decl>
>          </member-function>
> @@ -24349,7 +24349,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='768' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-134' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-132'/>
>            </function-decl>
>          </member-function>
> @@ -24457,7 +24457,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='756' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-137' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-135'/>
>            </function-decl>
>          </member-function>
> @@ -24470,7 +24470,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='768' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-137' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-135'/>
>            </function-decl>
>          </member-function>
> @@ -24560,7 +24560,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-145' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -24582,7 +24582,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIcE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-145' is-artificial='yes'/>
>              <parameter type-id='type-id-2914'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2915'/>
>            </function-decl>
>          </member-function>
> @@ -24648,7 +24648,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPcSsEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='756' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-131' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-129'/>
>            </function-decl>
>          </member-function>
> @@ -24661,7 +24661,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPcSsEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='768' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-131' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-129'/>
>            </function-decl>
>          </member-function>
> @@ -24754,7 +24754,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKcSsEppEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='756' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-128' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-126'/>
>            </function-decl>
>          </member-function>
> @@ -24767,7 +24767,7 @@
>          <member-function access='public'>
>            <function-decl name='operator--'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKcSsEmmEi'
> filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='768' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-128' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-126'/>
>            </function-decl>
>          </member-function>
> @@ -24845,7 +24845,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-149' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -24867,7 +24867,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIPN5mongo6logger8AppenderINS2_21MessageEventEphemeralEEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-149' is-artificial='yes'/>
>              <parameter type-id='type-id-2925'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2926'/>
>            </function-decl>
>          </member-function>
> @@ -24985,7 +24985,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-161' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25007,7 +25007,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-161' is-artificial='yes'/>
>              <parameter type-id='type-id-2932'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2933'/>
>            </function-decl>
>          </member-function>
> @@ -25035,7 +25035,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEED2Ev'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEED1Ev'>
>              <parameter type-id='type-id-161' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25078,7 +25078,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-157' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25100,7 +25100,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo17optionenvironment13OptionSectionEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-157' is-artificial='yes'/>
>              <parameter type-id='type-id-2937'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2938'/>
>            </function-decl>
>          </member-function>
> @@ -25151,7 +25151,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-159' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25173,7 +25173,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-159' is-artificial='yes'/>
>              <parameter type-id='type-id-2942'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2943'/>
>            </function-decl>
>          </member-function>
> @@ -25201,7 +25201,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEED2Ev'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEED1Ev'>
>              <parameter type-id='type-id-159' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25244,7 +25244,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-173' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25266,7 +25266,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISsE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISsE8allocateEmPKv'>
>              <parameter type-id='type-id-173' is-artificial='yes'/>
>              <parameter type-id='type-id-2947'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2948'/>
>            </function-decl>
>          </member-function>
> @@ -25302,7 +25302,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISsED2Ev'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISsED1Ev'>
>              <parameter type-id='type-id-173' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25352,7 +25352,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-163' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25374,7 +25374,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISsEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-163' is-artificial='yes'/>
>              <parameter type-id='type-id-2952'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2953'/>
>            </function-decl>
>          </member-function>
> @@ -25497,7 +25497,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-169' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25519,7 +25519,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsSsEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-169' is-artificial='yes'/>
>              <parameter type-id='type-id-2960'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2961'/>
>            </function-decl>
>          </member-function>
> @@ -25547,7 +25547,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsSsEEED2Ev'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsSsEEED1Ev'>
>              <parameter type-id='type-id-169' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25566,13 +25566,13 @@
>          <member-function access='public'>
>            <function-decl name='_M_addr'
> mangled-name='_ZN9__gnu_cxx16__aligned_bufferISt4pairIKSsSsEE7_M_addrEv'
> filepath='/usr/include/c++/4.9/ext/aligned_buffer.h' line='51' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN9__gnu_cxx16__aligned_bufferISt4pairIKSsSsEE7_M_addrEv'>
>              <parameter type-id='type-id-111' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='_M_addr'
> mangled-name='_ZNK9__gnu_cxx16__aligned_bufferISt4pairIKSsSsEE7_M_addrEv'
> filepath='/usr/include/c++/4.9/ext/aligned_buffer.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-237' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
> @@ -25673,7 +25673,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-181' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25695,7 +25695,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKSsSsEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-181' is-artificial='yes'/>
>              <parameter type-id='type-id-2967'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2968'/>
>            </function-decl>
>          </member-function>
> @@ -25746,7 +25746,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-183' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25768,7 +25768,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-183' is-artificial='yes'/>
>              <parameter type-id='type-id-2972'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2973'/>
>            </function-decl>
>          </member-function>
> @@ -25789,7 +25789,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEED2Ev'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEED2Ev'>
>              <parameter type-id='type-id-183' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25826,7 +25826,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-151' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25848,7 +25848,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIPN5mongo17optionenvironment10ConstraintEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-151' is-artificial='yes'/>
>              <parameter type-id='type-id-2977'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2978'/>
>            </function-decl>
>          </member-function>
> @@ -25966,7 +25966,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-153' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -25988,7 +25988,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIPN5mongo17optionenvironment13KeyConstraintEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-153' is-artificial='yes'/>
>              <parameter type-id='type-id-2984'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2985'/>
>            </function-decl>
>          </member-function>
> @@ -26106,7 +26106,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-167' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -26128,7 +26128,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsN5mongo17optionenvironment5ValueEEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-167' is-artificial='yes'/>
>              <parameter type-id='type-id-2991'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2992'/>
>            </function-decl>
>          </member-function>
> @@ -26155,13 +26155,13 @@
>          <member-function access='public'>
>            <function-decl name='_M_addr'
> mangled-name='_ZN9__gnu_cxx16__aligned_bufferISt4pairIKSsN5mongo17optionenvironment5ValueEEE7_M_addrEv'
> filepath='/usr/include/c++/4.9/ext/aligned_buffer.h' line='51' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-109' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='_M_addr'
> mangled-name='_ZNK9__gnu_cxx16__aligned_bufferISt4pairIKSsN5mongo17optionenvironment5ValueEEE7_M_addrEv'
> filepath='/usr/include/c++/4.9/ext/aligned_buffer.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-235' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
> @@ -26262,7 +26262,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-179' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -26284,7 +26284,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKSsN5mongo17optionenvironment5ValueEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-179' is-artificial='yes'/>
>              <parameter type-id='type-id-2998'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-2999'/>
>            </function-decl>
>          </member-function>
> @@ -26402,7 +26402,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-155' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -26424,7 +26424,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo17optionenvironment17OptionDescriptionEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-155' is-artificial='yes'/>
>              <parameter type-id='type-id-3005'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3006'/>
>            </function-decl>
>          </member-function>
> @@ -26475,7 +26475,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-141' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -26497,7 +26497,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIN5boost10shared_ptrINS1_15program_options18option_descriptionEEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-141' is-artificial='yes'/>
>              <parameter type-id='type-id-3010'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3011'/>
>            </function-decl>
>          </member-function>
> @@ -26615,7 +26615,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-147' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -26637,7 +26637,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorImE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-147' is-artificial='yes'/>
>              <parameter type-id='type-id-3017'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3018'/>
>            </function-decl>
>          </member-function>
> @@ -26688,7 +26688,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-139' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -26710,7 +26710,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIbE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-139' is-artificial='yes'/>
>              <parameter type-id='type-id-3022'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3023'/>
>            </function-decl>
>          </member-function>
> @@ -26761,7 +26761,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-143' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -26783,7 +26783,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIN5boost10shared_ptrINS1_15program_options19options_descriptionEEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-143' is-artificial='yes'/>
>              <parameter type-id='type-id-3027'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3028'/>
>            </function-decl>
>          </member-function>
> @@ -26877,13 +26877,13 @@
>          <member-function access='public'>
>            <function-decl name='_M_addr'
> mangled-name='_ZN9__gnu_cxx16__aligned_bufferISt4pairIKSsPN5mongo6logger9LogDomainINS4_21MessageEventEphemeralEEEEE7_M_addrEv'
> filepath='/usr/include/c++/4.9/ext/aligned_buffer.h' line='51' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-107' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='_M_addr'
> mangled-name='_ZNK9__gnu_cxx16__aligned_bufferISt4pairIKSsPN5mongo6logger9LogDomainINS4_21MessageEventEphemeralEEEEE7_M_addrEv'
> filepath='/usr/include/c++/4.9/ext/aligned_buffer.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-233' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
> @@ -26931,7 +26931,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-171' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -26953,7 +26953,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorINSt8__detail10_Hash_nodeISt4pairIKSsPN5mongo6logger9LogDomainINS6_21MessageEventEphemeralEEEELb1EEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-171' is-artificial='yes'/>
>              <parameter type-id='type-id-3034'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3035'/>
>            </function-decl>
>          </member-function>
> @@ -27004,7 +27004,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-177' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -27026,7 +27026,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKSsPN5mongo6logger9LogDomainINS4_21MessageEventEphemeralEEEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-177' is-artificial='yes'/>
>              <parameter type-id='type-id-3039'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3040'/>
>            </function-decl>
>          </member-function>
> @@ -27077,7 +27077,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-165' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -27099,7 +27099,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsPN5mongo15ServerParameterEEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-165' is-artificial='yes'/>
>              <parameter type-id='type-id-3044'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3045'/>
>            </function-decl>
>          </member-function>
> @@ -27203,7 +27203,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~new_allocator'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-175' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -27225,7 +27225,7 @@
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt4pairIKSsPN5mongo15ServerParameterEEE8allocateEmPKv'
> filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-175' is-artificial='yes'/>
>              <parameter type-id='type-id-3051'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-3052'/>
>            </function-decl>
>          </member-function>
> @@ -27525,10 +27525,10 @@
>              <var-decl name='_sources' type-id='type-id-3065'
> visibility='default'
> filepath='src/mongo/util/options_parser/option_description.h' line='216'
> column='1'/>
>            </data-member>
>            <data-member access='public' layout-offset-in-bits='1920'>
> -            <var-decl name='_positionalStart' type-id='type-id-29'
> visibility='default'
> filepath='src/mongo/util/options_parser/option_description.h' line='218'
> column='1'/>
> +            <var-decl name='_positionalStart' type-id='type-id-26'
> visibility='default'
> filepath='src/mongo/util/options_parser/option_description.h' line='218'
> column='1'/>
>            </data-member>
>            <data-member access='public' layout-offset-in-bits='1952'>
> -            <var-decl name='_positionalEnd' type-id='type-id-29'
> visibility='default'
> filepath='src/mongo/util/options_parser/option_description.h' line='219'
> column='1'/>
> +            <var-decl name='_positionalEnd' type-id='type-id-26'
> visibility='default'
> filepath='src/mongo/util/options_parser/option_description.h' line='219'
> column='1'/>
>            </data-member>
>            <data-member access='public' layout-offset-in-bits='1984'>
>              <var-decl name='_constraints' type-id='type-id-1458'
> visibility='default'
> filepath='src/mongo/util/options_parser/option_description.h' line='228'
> column='1'/>
> @@ -27593,16 +27593,16 @@
>            <member-function access='public'>
>              <function-decl name='positional'
> mangled-name='_ZN5mongo17optionenvironment17OptionDescription10positionalEii'
> filepath='src/mongo/util/options_parser/option_description.h' line='160'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1632' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-1631'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='validRange'
> mangled-name='_ZN5mongo17optionenvironment17OptionDescription10validRangeEll'
> filepath='src/mongo/util/options_parser/option_description.h' line='173'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1632' is-artificial='yes'/>
> -              <parameter type-id='type-id-23'/>
> -              <parameter type-id='type-id-23'/>
> +              <parameter type-id='type-id-30'/>
> +              <parameter type-id='type-id-30'/>
>                <return type-id='type-id-1631'/>
>              </function-decl>
>            </member-function>
> @@ -27656,19 +27656,19 @@
>                  <var-decl name='_boolVal' type-id='type-id-1'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='141' column='1'/>
>                </data-member>
>                <data-member access='private'>
> -                <var-decl name='_doubleVal' type-id='type-id-27'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='142' column='1'/>
> +                <var-decl name='_doubleVal' type-id='type-id-24'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='142' column='1'/>
>                </data-member>
>                <data-member access='private'>
> -                <var-decl name='_intVal' type-id='type-id-29'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='143' column='1'/>
> +                <var-decl name='_intVal' type-id='type-id-26'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='143' column='1'/>
>                </data-member>
>                <data-member access='private'>
> -                <var-decl name='_longVal' type-id='type-id-23'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='144' column='1'/>
> +                <var-decl name='_longVal' type-id='type-id-30'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='144' column='1'/>
>                </data-member>
>                <data-member access='private'>
> -                <var-decl name='_unsignedLongLongVal'
> type-id='type-id-34' visibility='default'
> filepath='src/mongo/util/options_parser/value.h' line='145' column='1'/>
> +                <var-decl name='_unsignedLongLongVal'
> type-id='type-id-32' visibility='default'
> filepath='src/mongo/util/options_parser/value.h' line='145' column='1'/>
>                </data-member>
>                <data-member access='private'>
> -                <var-decl name='_unsignedVal' type-id='type-id-25'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='146' column='1'/>
> +                <var-decl name='_unsignedVal' type-id='type-id-22'
> visibility='default' filepath='src/mongo/util/options_parser/value.h'
> line='146' column='1'/>
>                </data-member>
>              </union-decl>
>            </member-type>
> @@ -27732,21 +27732,21 @@
>            <member-function access='public' constructor='yes'>
>              <function-decl name='Value'
> filepath='src/mongo/util/options_parser/value.h' line='74' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1639' is-artificial='yes'/>
> -              <parameter type-id='type-id-27'/>
> +              <parameter type-id='type-id-24'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' constructor='yes'>
>              <function-decl name='Value'
> filepath='src/mongo/util/options_parser/value.h' line='75' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1639' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' constructor='yes'>
>              <function-decl name='Value'
> filepath='src/mongo/util/options_parser/value.h' line='76' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1639' is-artificial='yes'/>
> -              <parameter type-id='type-id-23'/>
> +              <parameter type-id='type-id-30'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -27767,14 +27767,14 @@
>            <member-function access='public' constructor='yes'>
>              <function-decl name='Value'
> filepath='src/mongo/util/options_parser/value.h' line='79' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1639' is-artificial='yes'/>
> -              <parameter type-id='type-id-34'/>
> +              <parameter type-id='type-id-32'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' constructor='yes'>
>              <function-decl name='Value'
> filepath='src/mongo/util/options_parser/value.h' line='80' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1639' is-artificial='yes'/>
> -              <parameter type-id='type-id-25'/>
> +              <parameter type-id='type-id-22'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -27887,13 +27887,13 @@
>            <member-function access='public' const='yes'>
>              <function-decl name='as&lt;std::basic_string&lt;char&gt;
> &gt;' mangled-name='_ZNK5mongo17optionenvironment5Value2asISsEET_v'
> filepath='src/mongo/util/options_parser/value.h' line='167' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo17optionenvironment5Value2asISsEET_v'>
>                <parameter type-id='type-id-589' is-artificial='yes'/>
> -              <return type-id='type-id-37'/>
> +              <return type-id='type-id-35'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
>              <function-decl name='as&lt;int&gt;'
> mangled-name='_ZNK5mongo17optionenvironment5Value2asIiEET_v'
> filepath='src/mongo/util/options_parser/value.h' line='167' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo17optionenvironment5Value2asIiEET_v'>
>                <parameter type-id='type-id-589' is-artificial='yes'/>
> -              <return type-id='type-id-29'/>
> +              <return type-id='type-id-26'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -27919,7 +27919,7 @@
>            <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>              <function-decl name='~Constraint'
> filepath='src/mongo/util/options_parser/constraints.h' line='50' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1617' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -27956,7 +27956,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~Environment'
> filepath='src/mongo/util/options_parser/environment.h' line='112'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1623' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28061,7 +28061,7 @@
>            <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>              <function-decl name='~KeyConstraint'
> filepath='src/mongo/util/options_parser/constraints.h' line='64' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1625' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28070,12 +28070,12 @@
>        </namespace-decl>
>        <namespace-decl name='endian'>
>          <function-decl name='nativeToLittle&lt;int&gt;'
> mangled-name='_ZN5mongo6endian14nativeToLittleIiEET_S2_'
> filepath='src/mongo/platform/endian.h' line='499' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo6endian14nativeToLittleIiEET_S2_'>
> -          <parameter type-id='type-id-29'/>
> -          <return type-id='type-id-29'/>
> +          <parameter type-id='type-id-26'/>
> +          <return type-id='type-id-26'/>
>          </function-decl>
>          <function-decl name='littleToNative&lt;int&gt;'
> mangled-name='_ZN5mongo6endian14littleToNativeIiEET_S2_'
> filepath='src/mongo/platform/endian.h' line='504' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo6endian14littleToNativeIiEET_S2_'>
> -          <parameter type-id='type-id-29'/>
> -          <return type-id='type-id-29'/>
> +          <parameter type-id='type-id-26'/>
> +          <return type-id='type-id-26'/>
>          </function-decl>
>          <function-decl name='nativeToLittle&lt;char&gt;'
> mangled-name='_ZN5mongo6endian14nativeToLittleIcEET_S2_'
> filepath='src/mongo/platform/endian.h' line='499' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo6endian14nativeToLittleIcEET_S2_'>
>            <parameter type-id='type-id-5'/>
> @@ -28169,7 +28169,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~ComponentMessageLogDomain'
> filepath='src/mongo/logger/component_message_log_domain.h' line='45'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1594' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28285,7 +28285,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~LogDomain'
> filepath='src/mongo/logger/log_domain.h' line='88' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1600' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28401,7 +28401,7 @@
>          </class-decl>
>          <class-decl name='LogSeverity' size-in-bits='32'
> visibility='default' filepath='src/mongo/logger/log_severity.h' line='44'
> column='1' id='type-id-565'>
>            <data-member access='private' layout-offset-in-bits='0'>
> -            <var-decl name='_severity' type-id='type-id-29'
> visibility='default' filepath='src/mongo/logger/log_severity.h' line='135'
> column='1'/>
> +            <var-decl name='_severity' type-id='type-id-26'
> visibility='default' filepath='src/mongo/logger/log_severity.h' line='135'
> column='1'/>
>            </data-member>
>            <member-function access='public' static='yes'>
>              <function-decl name='Severe'
> mangled-name='_ZN5mongo6logger11LogSeverity6SevereEv'
> filepath='src/mongo/logger/log_severity.h' line='50' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -28430,20 +28430,20 @@
>            </member-function>
>            <member-function access='public' static='yes'>
>              <function-decl name='Debug'
> mangled-name='_ZN5mongo6logger11LogSeverity5DebugEi'
> filepath='src/mongo/logger/log_severity.h' line='55' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-565'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes'>
>              <function-decl name='cast'
> mangled-name='_ZN5mongo6logger11LogSeverity4castEi'
> filepath='src/mongo/logger/log_severity.h' line='63' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-565'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
>              <function-decl name='toInt'
> mangled-name='_ZNK5mongo6logger11LogSeverity5toIntEv'
> filepath='src/mongo/logger/log_severity.h' line='65' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-567' is-artificial='yes'/>
> -              <return type-id='type-id-29'/>
> +              <return type-id='type-id-26'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
> @@ -28521,14 +28521,14 @@
>            <member-function access='private' constructor='yes'>
>              <function-decl name='LogSeverity'
> filepath='src/mongo/logger/log_severity.h' line='123' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1605' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private' constructor='yes'>
>              <function-decl name='LogSeverity'
> mangled-name='_ZN5mongo6logger11LogSeverityC2Ei'
> filepath='src/mongo/logger/log_severity.h' line='123' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo6logger11LogSeverityC2Ei'>
>                <parameter type-id='type-id-1605' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28638,7 +28638,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~LogComponentSettings'
> filepath='src/mongo/logger/log_component_settings.h' line='47' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1598' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28716,7 +28716,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~LogManager'
> filepath='src/mongo/logger/log_manager.h' line='50' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1604' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28759,7 +28759,7 @@
>            </data-member>
>            <member-function access='public' static='yes'>
>              <function-decl name='severityCast'
> mangled-name='_ZN5mongo6logger16LogstreamBuilder12severityCastEi'
> filepath='src/mongo/logger/logstream_builder.h' line='51' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-565'/>
>              </function-decl>
>            </member-function>
> @@ -28820,7 +28820,7 @@
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~LogstreamBuilder'
> filepath='src/mongo/logger/logstream_builder.h' line='107' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1609' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28875,7 +28875,7 @@
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEi'
> filepath='src/mongo/logger/logstream_builder.h' line='144' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1609' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-1607'/>
>              </function-decl>
>            </member-function>
> @@ -28889,7 +28889,7 @@
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEl'
> filepath='src/mongo/logger/logstream_builder.h' line='152' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1609' is-artificial='yes'/>
> -              <parameter type-id='type-id-23'/>
> +              <parameter type-id='type-id-30'/>
>                <return type-id='type-id-1607'/>
>              </function-decl>
>            </member-function>
> @@ -28903,7 +28903,7 @@
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEj'
> filepath='src/mongo/logger/logstream_builder.h' line='160' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1609' is-artificial='yes'/>
> -              <parameter type-id='type-id-25'/>
> +              <parameter type-id='type-id-22'/>
>                <return type-id='type-id-1607'/>
>              </function-decl>
>            </member-function>
> @@ -28917,28 +28917,28 @@
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEd'
> filepath='src/mongo/logger/logstream_builder.h' line='168' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1609' is-artificial='yes'/>
> -              <parameter type-id='type-id-27'/>
> +              <parameter type-id='type-id-24'/>
>                <return type-id='type-id-1607'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEPv'
> filepath='src/mongo/logger/logstream_builder.h' line='172' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1609' is-artificial='yes'/>
> -              <parameter type-id='type-id-26'/>
> +              <parameter type-id='type-id-23'/>
>                <return type-id='type-id-1607'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEx'
> filepath='src/mongo/logger/logstream_builder.h' line='180' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1609' is-artificial='yes'/>
> -              <parameter type-id='type-id-33'/>
> +              <parameter type-id='type-id-31'/>
>                <return type-id='type-id-1607'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEy'
> filepath='src/mongo/logger/logstream_builder.h' line='184' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1609' is-artificial='yes'/>
> -              <parameter type-id='type-id-34'/>
> +              <parameter type-id='type-id-32'/>
>                <return type-id='type-id-1607'/>
>              </function-decl>
>            </member-function>
> @@ -28981,7 +28981,7 @@
>            <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>              <function-decl name='~Tee' filepath='src/mongo/logger/tee.h'
> line='37' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-1614' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -28998,12 +28998,12 @@
>              <var-decl name='_label' type-id='type-id-1336'
> visibility='default' filepath='src/mongo/logger/labeled_level.h' line='66'
> column='1'/>
>            </data-member>
>            <data-member access='private' layout-offset-in-bits='64'>
> -            <var-decl name='_level' type-id='type-id-29'
> visibility='default' filepath='src/mongo/logger/labeled_level.h' line='67'
> column='1'/>
> +            <var-decl name='_level' type-id='type-id-26'
> visibility='default' filepath='src/mongo/logger/labeled_level.h' line='67'
> column='1'/>
>            </data-member>
>            <member-function access='public' constructor='yes'>
>              <function-decl name='LabeledLevel'
> filepath='src/mongo/logger/labeled_level.h' line='42' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1595' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -29011,7 +29011,7 @@
>              <function-decl name='LabeledLevel'
> filepath='src/mongo/logger/labeled_level.h' line='43' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1595' is-artificial='yes'/>
>                <parameter type-id='type-id-84'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -29019,21 +29019,21 @@
>              <function-decl name='LabeledLevel'
> filepath='src/mongo/logger/labeled_level.h' line='44' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-1595' is-artificial='yes'/>
>                <parameter type-id='type-id-1338'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
>              <function-decl name='operator+'
> mangled-name='_ZNK5mongo6logger12LabeledLevelplEi'
> filepath='src/mongo/logger/labeled_level.h' line='46' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-547' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-544'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
>              <function-decl name='operator-'
> mangled-name='_ZNK5mongo6logger12LabeledLevelmiEi'
> filepath='src/mongo/logger/labeled_level.h' line='50' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-547' is-artificial='yes'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-544'/>
>              </function-decl>
>            </member-function>
> @@ -29046,7 +29046,7 @@
>            <member-function access='public' const='yes'>
>              <function-decl name='getLevel'
> mangled-name='_ZNK5mongo6logger12LabeledLevel8getLevelEv'
> filepath='src/mongo/logger/labeled_level.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                <parameter type-id='type-id-547' is-artificial='yes'/>
> -              <return type-id='type-id-29'/>
> +              <return type-id='type-id-26'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
> @@ -29059,7 +29059,7 @@
>        </namespace-decl>
>        <class-decl name='Date_t' size-in-bits='64' visibility='default'
> filepath='src/mongo/util/time_support.h' line='95' column='1'
> id='type-id-443'>
>          <data-member access='private' layout-offset-in-bits='0'>
> -          <var-decl name='millis' type-id='type-id-33'
> visibility='default' filepath='src/mongo/util/time_support.h' line='259'
> column='1'/>
> +          <var-decl name='millis' type-id='type-id-31'
> visibility='default' filepath='src/mongo/util/time_support.h' line='259'
> column='1'/>
>          </data-member>
>          <member-function access='public' static='yes'>
>            <function-decl name='max' mangled-name='_ZN5mongo6Date_t3maxEv'
> filepath='src/mongo/util/time_support.h' line='102' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -29073,7 +29073,7 @@
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='fromMillisSinceEpoch'
> mangled-name='_ZN5mongo6Date_t20fromMillisSinceEpochEx'
> filepath='src/mongo/util/time_support.h' line='112' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-33'/>
> +            <parameter type-id='type-id-31'/>
>              <return type-id='type-id-443'/>
>            </function-decl>
>          </member-function>
> @@ -29111,7 +29111,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='toULL'
> mangled-name='_ZNK5mongo6Date_t5toULLEv'
> filepath='src/mongo/util/time_support.h' line='164' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-445' is-artificial='yes'/>
> -            <return type-id='type-id-34'/>
> +            <return type-id='type-id-32'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -29123,7 +29123,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='toMillisSinceEpoch'
> mangled-name='_ZNK5mongo6Date_t18toMillisSinceEpochEv'
> filepath='src/mongo/util/time_support.h' line='178' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-445' is-artificial='yes'/>
> -            <return type-id='type-id-33'/>
> +            <return type-id='type-id-31'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -29196,7 +29196,7 @@
>          <member-function access='private' constructor='yes'>
>            <function-decl name='Date_t'
> filepath='src/mongo/util/time_support.h' line='257' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1535' is-artificial='yes'/>
> -            <parameter type-id='type-id-33'/>
> +            <parameter type-id='type-id-31'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -29244,7 +29244,7 @@
>            <function-decl name='compare'
> mangled-name='_ZNK5mongo10StringData7compareES0_'
> filepath='src/mongo/base/string_data.h' line='87' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-528' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -29334,7 +29334,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator[]'
> mangled-name='_ZNK5mongo10StringDataixEj'
> filepath='src/mongo/base/string_data.h' line='140' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-528' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-5'/>
>            </function-decl>
>          </member-function>
> @@ -29390,7 +29390,7 @@
>                <function-decl name='create'
> mangled-name='_ZN5mongo6Status9ErrorInfo6createENS_10ErrorCodes5ErrorESsi'
> filepath='src/mongo/base/status.h' line='129' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                  <parameter type-id='type-id-450'/>
>                  <parameter type-id='type-id-1336'/>
> -                <parameter type-id='type-id-29'/>
> +                <parameter type-id='type-id-26'/>
>                  <return type-id='type-id-1575'/>
>                </function-decl>
>              </member-function>
> @@ -29399,7 +29399,7 @@
>                  <parameter type-id='type-id-1575' is-artificial='yes'/>
>                  <parameter type-id='type-id-450'/>
>                  <parameter type-id='type-id-1336'/>
> -                <parameter type-id='type-id-29'/>
> +                <parameter type-id='type-id-26'/>
>                  <return type-id='type-id-56'/>
>                </function-decl>
>              </member-function>
> @@ -29418,7 +29418,7 @@
>              <parameter type-id='type-id-1573' is-artificial='yes'/>
>              <parameter type-id='type-id-450'/>
>              <parameter type-id='type-id-1336'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -29453,7 +29453,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~Status'
> filepath='src/mongo/base/status.h' line='80' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1573' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -29526,7 +29526,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='location'
> mangled-name='_ZNK5mongo6Status8locationEv'
> filepath='src/mongo/base/status.h' line='110' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-520' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -29569,7 +29569,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~Status'
> mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusD1Ev'>
>              <parameter type-id='type-id-1573' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -29582,7 +29582,7 @@
>        </class-decl>
>        <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32'
> visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40'
> column='1' id='type-id-379'>
>          <member-type access='public'>
> -          <typedef-decl name='WordType' type-id='type-id-25'
> filepath='src/mongo/platform/atomic_word.h' line='45' column='1'
> id='type-id-3081'/>
> +          <typedef-decl name='WordType' type-id='type-id-22'
> filepath='src/mongo/platform/atomic_word.h' line='45' column='1'
> id='type-id-3081'/>
>          </member-type>
>          <data-member access='private' layout-offset-in-bits='0'>
>            <var-decl name='_value' type-id='type-id-1102'
> visibility='default' filepath='src/mongo/platform/atomic_word.h' line='149'
> column='1'/>
> @@ -29837,7 +29837,7 @@
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='fromInt'
> mangled-name='_ZN5mongo10ErrorCodes7fromIntEi'
> filepath='build/debug/mongo/base/error_codes.h' line='223' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-450'/>
>            </function-decl>
>          </member-function>
> @@ -30060,7 +30060,7 @@
>              <parameter type-id='type-id-1577'/>
>              <parameter type-id='type-id-1'/>
>              <parameter type-id='type-id-1'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30068,7 +30068,7 @@
>            <function-decl name='jsonString'
> mangled-name='_ZNK5mongo7BSONObj10jsonStringENS_16JsonStringFormatEib'
> filepath='src/mongo/bson/bsonobj.h' line='198' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-401' is-artificial='yes'/>
>              <parameter type-id='type-id-3083'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <parameter type-id='type-id-1'/>
>              <return type-id='type-id-1336'/>
>            </function-decl>
> @@ -30078,7 +30078,7 @@
>              <parameter type-id='type-id-1512' is-artificial='yes'/>
>              <parameter type-id='type-id-1510'/>
>              <parameter type-id='type-id-2099'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -30091,14 +30091,14 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='nFields'
> mangled-name='_ZNK5mongo7BSONObj7nFieldsEv'
> filepath='src/mongo/bson/bsonobj.h' line='213' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-401' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='getFieldNames'
> mangled-name='_ZNK5mongo7BSONObj13getFieldNamesERSt3setISsSt4lessISsESaISsEE'
> filepath='src/mongo/bson/bsonobj.h' line='216' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-401' is-artificial='yes'/>
>              <parameter type-id='type-id-2099'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -30143,7 +30143,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='getFields'
> mangled-name='_ZNK5mongo7BSONObj9getFieldsEjPPKcPNS_11BSONElementE'
> filepath='src/mongo/bson/bsonobj.h' line='247' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-401' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <parameter type-id='type-id-365'/>
>              <parameter type-id='type-id-1505'/>
>              <return type-id='type-id-56'/>
> @@ -30159,7 +30159,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator[]'
> mangled-name='_ZNK5mongo7BSONObjixEi' filepath='src/mongo/bson/bsonobj.h'
> line='256' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-401' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-394'/>
>            </function-decl>
>          </member-function>
> @@ -30195,7 +30195,7 @@
>            <function-decl name='getIntField'
> mangled-name='_ZNK5mongo7BSONObj11getIntFieldENS_10StringDataE'
> filepath='src/mongo/bson/bsonobj.h' line='279' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-401' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -30251,7 +30251,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='objsize'
> mangled-name='_ZNK5mongo7BSONObj7objsizeEv'
> filepath='src/mongo/bson/bsonobj.h' line='322' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo7BSONObj7objsizeEv'>
>              <parameter type-id='type-id-401' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -30310,7 +30310,7 @@
>              <parameter type-id='type-id-400'/>
>              <parameter type-id='type-id-502'/>
>              <parameter type-id='type-id-1'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -30319,7 +30319,7 @@
>              <parameter type-id='type-id-400'/>
>              <parameter type-id='type-id-400'/>
>              <parameter type-id='type-id-1'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -30356,7 +30356,7 @@
>              <parameter type-id='type-id-400'/>
>              <parameter type-id='type-id-400'/>
>              <parameter type-id='type-id-1'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -30501,7 +30501,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='memUsageForSorter'
> mangled-name='_ZNK5mongo7BSONObj17memUsageForSorterEv'
> filepath='src/mongo/bson/bsonobj.h' line='578' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-401' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' const='yes'>
> @@ -30567,28 +30567,28 @@
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEd'
> filepath='src/mongo/bson/util/builder.h' line='356' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-27'/>
> +            <parameter type-id='type-id-24'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEi'
> filepath='src/mongo/bson/util/builder.h' line='359' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEi'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEj'
> filepath='src/mongo/bson/util/builder.h' line='362' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEl'
> filepath='src/mongo/bson/util/builder.h' line='365' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-23'/>
> +            <parameter type-id='type-id-30'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
>          </member-function>
> @@ -30602,28 +30602,28 @@
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEx'
> filepath='src/mongo/bson/util/builder.h' line='371' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-33'/>
> +            <parameter type-id='type-id-31'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEy'
> filepath='src/mongo/bson/util/builder.h' line='374' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-34'/>
> +            <parameter type-id='type-id-32'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEs'
> filepath='src/mongo/bson/util/builder.h' line='377' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-35'/>
> +            <parameter type-id='type-id-33'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEPKv'
> filepath='src/mongo/bson/util/builder.h' line='380' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
>          </member-function>
> @@ -30651,7 +30651,7 @@
>          <member-function access='public'>
>            <function-decl name='appendDoubleNice'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE16appendDoubleNiceEd'
> filepath='src/mongo/bson/util/builder.h' line='399' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-27'/>
> +            <parameter type-id='type-id-24'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30659,7 +30659,7 @@
>            <function-decl name='write'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5writeEPKci'
> filepath='src/mongo/bson/util/builder.h' line='412' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
>              <parameter type-id='type-id-84'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30673,7 +30673,7 @@
>          <member-function access='public'>
>            <function-decl name='reset'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5resetEi'
> filepath='src/mongo/bson/util/builder.h' line='420' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30686,7 +30686,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='len'
> mangled-name='_ZNK5mongo17StringBuilderImplINS_16TrivialAllocatorEE3lenEv'
> filepath='src/mongo/bson/util/builder.h' line='429' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-524' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
> @@ -30706,8 +30706,8 @@
>          <member-function access='private'>
>            <function-decl name='SBNUM&lt;int&gt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIiEERS2_T_iPKc'
> filepath='src/mongo/bson/util/builder.h' line='441' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIiEERS2_T_iPKc'>
>              <parameter type-id='type-id-1579' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-26'/>
>              <parameter type-id='type-id-84'/>
>              <return type-id='type-id-1578'/>
>            </function-decl>
> @@ -30727,13 +30727,13 @@
>            <var-decl name='data' type-id='type-id-71' visibility='default'
> filepath='src/mongo/bson/util/builder.h' line='313' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='128'>
> -          <var-decl name='l' type-id='type-id-29' visibility='default'
> filepath='src/mongo/bson/util/builder.h' line='314' column='1'/>
> +          <var-decl name='l' type-id='type-id-26' visibility='default'
> filepath='src/mongo/bson/util/builder.h' line='314' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='160'>
> -          <var-decl name='size' type-id='type-id-29' visibility='default'
> filepath='src/mongo/bson/util/builder.h' line='315' column='1'/>
> +          <var-decl name='size' type-id='type-id-26' visibility='default'
> filepath='src/mongo/bson/util/builder.h' line='315' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='192'>
> -          <var-decl name='reservedBytes' type-id='type-id-29'
> visibility='default' filepath='src/mongo/bson/util/builder.h' line='316'
> column='1'/>
> +          <var-decl name='reservedBytes' type-id='type-id-26'
> visibility='default' filepath='src/mongo/bson/util/builder.h' line='316'
> column='1'/>
>          </data-member>
>          <member-function access='private'>
>            <function-decl name='_BufBuilder'
> filepath='src/mongo/bson/util/builder.h' line='122' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -30752,14 +30752,14 @@
>          <member-function access='public'>
>            <function-decl name='_BufBuilder'
> filepath='src/mongo/bson/util/builder.h' line='127' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_BufBuilder'
> filepath='src/mongo/bson/util/builder.h' line='138' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30778,14 +30778,14 @@
>          <member-function access='public'>
>            <function-decl name='reset'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE5resetEi'
> filepath='src/mongo/bson/util/builder.h' line='153' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='skip'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4skipEi'
> filepath='src/mongo/bson/util/builder.h' line='169' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4skipEi'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-71'/>
>            </function-decl>
>          </member-function>
> @@ -30831,21 +30831,21 @@
>          <member-function access='public'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendNumEs'
> filepath='src/mongo/bson/util/builder.h' line='196' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-35'/>
> +            <parameter type-id='type-id-33'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendNumEi'
> filepath='src/mongo/bson/util/builder.h' line='200' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendNumEi'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendNumEj'
> filepath='src/mongo/bson/util/builder.h' line='204' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30859,21 +30859,21 @@
>          <member-function access='public'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendNumEd'
> filepath='src/mongo/bson/util/builder.h' line='211' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-27'/>
> +            <parameter type-id='type-id-24'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendNumEx'
> filepath='src/mongo/bson/util/builder.h' line='215' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-33'/>
> +            <parameter type-id='type-id-31'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendNumEy'
> filepath='src/mongo/bson/util/builder.h' line='219' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-34'/>
> +            <parameter type-id='type-id-32'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30887,7 +30887,7 @@
>          <member-function access='public'>
>            <function-decl name='appendBuf'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendBufEPKvm'
> filepath='src/mongo/bson/util/builder.h' line='227' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendBufEPKvm'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <parameter type-id='type-id-64'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
> @@ -30903,47 +30903,47 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='len'
> mangled-name='_ZNK5mongo11_BufBuilderINS_16TrivialAllocatorEE3lenEv'
> filepath='src/mongo/bson/util/builder.h' line='242' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo11_BufBuilderINS_16TrivialAllocatorEE3lenEv'>
>              <parameter type-id='type-id-539' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='setlen'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE6setlenEi'
> filepath='src/mongo/bson/util/builder.h' line='245' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='getSize'
> mangled-name='_ZNK5mongo11_BufBuilderINS_16TrivialAllocatorEE7getSizeEv'
> filepath='src/mongo/bson/util/builder.h' line='249' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo11_BufBuilderINS_16TrivialAllocatorEE7getSizeEv'>
>              <parameter type-id='type-id-539' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='grow'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4growEi'
> filepath='src/mongo/bson/util/builder.h' line='254' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4growEi'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-71'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='reserveBytes'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE12reserveBytesEi'
> filepath='src/mongo/bson/util/builder.h' line='268' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE12reserveBytesEi'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='claimReservedBytes'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE18claimReservedBytesEi'
> filepath='src/mongo/bson/util/builder.h' line='282' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE18claimReservedBytesEi'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
>            <function-decl name='grow_reallocate'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE15grow_reallocateEi'
> filepath='src/mongo/bson/util/builder.h' line='297' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE15grow_reallocateEi'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30957,21 +30957,21 @@
>          <member-function access='private'>
>            <function-decl name='appendNumImpl&lt;int&gt;'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE13appendNumImplIiEEvT_'
> filepath='src/mongo/bson/util/builder.h' line='289' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE13appendNumImplIiEEvT_'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~_BufBuilder'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEED2Ev'
> filepath='src/mongo/bson/util/builder.h' line='138' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEED1Ev'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='_BufBuilder'
> mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEEC2Ei'
> filepath='src/mongo/bson/util/builder.h' line='127' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEEC1Ei'>
>              <parameter type-id='type-id-1585' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -30981,21 +30981,21 @@
>            <function-decl name='Malloc'
> mangled-name='_ZN5mongo16TrivialAllocator6MallocEm'
> filepath='src/mongo/bson/util/builder.h' line='79' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo16TrivialAllocator6MallocEm'>
>              <parameter type-id='type-id-1583' is-artificial='yes'/>
>              <parameter type-id='type-id-64'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='Realloc'
> mangled-name='_ZN5mongo16TrivialAllocator7ReallocEPvm'
> filepath='src/mongo/bson/util/builder.h' line='82' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo16TrivialAllocator7ReallocEPvm'>
>              <parameter type-id='type-id-1583' is-artificial='yes'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <parameter type-id='type-id-64'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='Free'
> mangled-name='_ZN5mongo16TrivialAllocator4FreeEPv'
> filepath='src/mongo/bson/util/builder.h' line='85' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo16TrivialAllocator4FreeEPv'>
>              <parameter type-id='type-id-1583' is-artificial='yes'/>
> -            <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -31095,14 +31095,14 @@
>          <member-function access='public' constructor='yes'>
>            <function-decl name='Decimal128'
> filepath='src/mongo/platform/decimal128.h' line='131' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1537' is-artificial='yes'/>
> -            <parameter type-id='type-id-33'/>
> +            <parameter type-id='type-id-31'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' constructor='yes'>
>            <function-decl name='Decimal128'
> filepath='src/mongo/platform/decimal128.h' line='142' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1537' is-artificial='yes'/>
> -            <parameter type-id='type-id-27'/>
> +            <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-3086'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
> @@ -31191,7 +31191,7 @@
>            <function-decl name='toDouble'
> mangled-name='_ZNK5mongo10Decimal1288toDoubleENS0_12RoundingModeE'
> filepath='src/mongo/platform/decimal128.h' line='211' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-449' is-artificial='yes'/>
>              <parameter type-id='type-id-3086'/>
> -            <return type-id='type-id-27'/>
> +            <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31199,7 +31199,7 @@
>              <parameter type-id='type-id-449' is-artificial='yes'/>
>              <parameter type-id='type-id-2170'/>
>              <parameter type-id='type-id-3086'/>
> -            <return type-id='type-id-27'/>
> +            <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31381,10 +31381,10 @@
>            <var-decl name='data' type-id='type-id-84' visibility='default'
> filepath='src/mongo/bson/bsonelement.h' line='617' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='64'>
> -          <var-decl name='fieldNameSize_' type-id='type-id-29'
> visibility='default' filepath='src/mongo/bson/bsonelement.h' line='618'
> column='1'/>
> +          <var-decl name='fieldNameSize_' type-id='type-id-26'
> visibility='default' filepath='src/mongo/bson/bsonelement.h' line='618'
> column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='96'>
> -          <var-decl name='totalSize' type-id='type-id-29'
> visibility='default' filepath='src/mongo/bson/bsonelement.h' line='620'
> column='1'/>
> +          <var-decl name='totalSize' type-id='type-id-26'
> visibility='default' filepath='src/mongo/bson/bsonelement.h' line='620'
> column='1'/>
>          </data-member>
>          <member-function access='public' const='yes'>
>            <function-decl name='String'
> mangled-name='_ZNK5mongo11BSONElement6StringEv'
> filepath='src/mongo/bson/bsonelement.h' line='79' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -31407,7 +31407,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='Number'
> mangled-name='_ZNK5mongo11BSONElement6NumberEv'
> filepath='src/mongo/bson/bsonelement.h' line='88' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-27'/>
> +            <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31419,19 +31419,19 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='Double'
> mangled-name='_ZNK5mongo11BSONElement6DoubleEv'
> filepath='src/mongo/bson/bsonelement.h' line='94' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-27'/>
> +            <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='Long'
> mangled-name='_ZNK5mongo11BSONElement4LongEv'
> filepath='src/mongo/bson/bsonelement.h' line='97' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-33'/>
> +            <return type-id='type-id-31'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='Int'
> mangled-name='_ZNK5mongo11BSONElement3IntEv'
> filepath='src/mongo/bson/bsonelement.h' line='100' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31559,7 +31559,7 @@
>              <parameter type-id='type-id-1577'/>
>              <parameter type-id='type-id-1'/>
>              <parameter type-id='type-id-1'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -31568,7 +31568,7 @@
>              <parameter type-id='type-id-397' is-artificial='yes'/>
>              <parameter type-id='type-id-3083'/>
>              <parameter type-id='type-id-1'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1336'/>
>            </function-decl>
>          </member-function>
> @@ -31594,7 +31594,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='canonicalType'
> mangled-name='_ZNK5mongo11BSONElement13canonicalTypeEv'
> filepath='src/mongo/bson/bsonelement.h' line='200' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31606,14 +31606,14 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='size'
> mangled-name='_ZNK5mongo11BSONElement4sizeEi'
> filepath='src/mongo/bson/bsonelement.h' line='214' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> -            <return type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='size'
> mangled-name='_ZNK5mongo11BSONElement4sizeEv'
> filepath='src/mongo/bson/bsonelement.h' line='215' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31638,7 +31638,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='fieldNameSize'
> mangled-name='_ZNK5mongo11BSONElement13fieldNameSizeEv'
> filepath='src/mongo/bson/bsonelement.h' line='236' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31656,7 +31656,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='valuesize'
> mangled-name='_ZNK5mongo11BSONElement9valuesizeEv'
> filepath='src/mongo/bson/bsonelement.h' line='251' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31704,13 +31704,13 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='_numberDouble'
> mangled-name='_ZNK5mongo11BSONElement13_numberDoubleEv'
> filepath='src/mongo/bson/bsonelement.h' line='290' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-27'/>
> +            <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='_numberInt'
> mangled-name='_ZNK5mongo11BSONElement10_numberIntEv'
> filepath='src/mongo/bson/bsonelement.h' line='295' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31722,25 +31722,25 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='_numberLong'
> mangled-name='_ZNK5mongo11BSONElement11_numberLongEv'
> filepath='src/mongo/bson/bsonelement.h' line='305' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-33'/>
> +            <return type-id='type-id-31'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='numberInt'
> mangled-name='_ZNK5mongo11BSONElement9numberIntEv'
> filepath='src/mongo/bson/bsonelement.h' line='310' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='numberLong'
> mangled-name='_ZNK5mongo11BSONElement10numberLongEv'
> filepath='src/mongo/bson/bsonelement.h' line='314' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-33'/>
> +            <return type-id='type-id-31'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='safeNumberLong'
> mangled-name='_ZNK5mongo11BSONElement14safeNumberLongEv'
> filepath='src/mongo/bson/bsonelement.h' line='321' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-33'/>
> +            <return type-id='type-id-31'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31752,13 +31752,13 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='numberDouble'
> mangled-name='_ZNK5mongo11BSONElement12numberDoubleEv'
> filepath='src/mongo/bson/bsonelement.h' line='329' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-27'/>
> +            <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='number'
> mangled-name='_ZNK5mongo11BSONElement6numberEv'
> filepath='src/mongo/bson/bsonelement.h' line='333' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-27'/>
> +            <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31776,7 +31776,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='valuestrsize'
> mangled-name='_ZNK5mongo11BSONElement12valuestrsizeEv'
> filepath='src/mongo/bson/bsonelement.h' line='352' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31818,7 +31818,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='codeWScopeCodeLen'
> mangled-name='_ZNK5mongo11BSONElement17codeWScopeCodeLenEv'
> filepath='src/mongo/bson/bsonelement.h' line='394' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31909,7 +31909,7 @@
>              <parameter type-id='type-id-397' is-artificial='yes'/>
>              <parameter type-id='type-id-396'/>
>              <parameter type-id='type-id-1'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31921,8 +31921,8 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='getGtLtOp'
> mangled-name='_ZNK5mongo11BSONElement9getGtLtOpEi'
> filepath='src/mongo/bson/bsonelement.h' line='504' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> -            <return type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' constructor='yes'>
> @@ -31958,13 +31958,13 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='timestampInc'
> mangled-name='_ZNK5mongo11BSONElement12timestampIncEv'
> filepath='src/mongo/bson/bsonelement.h' line='543' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-25'/>
> +            <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='timestampValue'
> mangled-name='_ZNK5mongo11BSONElement14timestampValueEv'
> filepath='src/mongo/bson/bsonelement.h' line='547' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <return type-id='type-id-34'/>
> +            <return type-id='type-id-32'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -31990,7 +31990,7 @@
>            <function-decl name='BSONElement'
> filepath='src/mongo/bson/bsonelement.h' line='574' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1505' is-artificial='yes'/>
>              <parameter type-id='type-id-84'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -32005,7 +32005,7 @@
>            <function-decl name='BSONElement'
> filepath='src/mongo/bson/bsonelement.h' line='605' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1505' is-artificial='yes'/>
>              <parameter type-id='type-id-84'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <parameter type-id='type-id-3088'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
> @@ -32019,7 +32019,7 @@
>          <member-function access='private' const='yes'>
>            <function-decl name='chk'
> mangled-name='_ZNK5mongo11BSONElement3chkEi'
> filepath='src/mongo/bson/bsonelement.h' line='624' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-397' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-396'/>
>            </function-decl>
>          </member-function>
> @@ -32103,7 +32103,7 @@
>            <function-decl name='compare'
> mangled-name='_ZNK5mongo3OID7compareERKS0_' filepath='src/mongo/bson/oid.h'
> line='108' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-499' is-artificial='yes'/>
>              <parameter type-id='type-id-498'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -32188,7 +32188,7 @@
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='getMachineId'
> mangled-name='_ZN5mongo3OID12getMachineIdEv'
> filepath='src/mongo/bson/oid.h' line='169' column='1' visibility='default'
> binding='global' size-in-bits='64'>
> -            <return type-id='type-id-25'/>
> +            <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
> @@ -32302,7 +32302,7 @@
>        </class-decl>
>        <class-decl name='LittleEndian&lt;int&gt;' size-in-bits='32'
> is-struct='yes' visibility='default'
> filepath='src/mongo/base/data_type_endian.h' line='56' column='1'
> id='type-id-483'>
>          <data-member access='public' layout-offset-in-bits='0'>
> -          <var-decl name='value' type-id='type-id-29'
> visibility='default' filepath='src/mongo/base/data_type_endian.h' line='59'
> column='1'/>
> +          <var-decl name='value' type-id='type-id-26'
> visibility='default' filepath='src/mongo/base/data_type_endian.h' line='59'
> column='1'/>
>          </data-member>
>          <member-function access='public'>
>            <function-decl name='LittleEndian'
> filepath='src/mongo/base/data_type_endian.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -32313,20 +32313,20 @@
>          <member-function access='public'>
>            <function-decl name='LittleEndian'
> filepath='src/mongo/base/data_type_endian.h' line='58' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1551' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK5mongo12LittleEndianIiEcviEv'
> filepath='src/mongo/base/data_type_endian.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo12LittleEndianIiEcviEv'>
>              <parameter type-id='type-id-486' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='LittleEndian'
> mangled-name='_ZN5mongo12LittleEndianIiEC2Ei'
> filepath='src/mongo/base/data_type_endian.h' line='58' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo12LittleEndianIiEC1Ei'>
>              <parameter type-id='type-id-1551' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -32443,10 +32443,10 @@
>        </enum-decl>
>        <class-decl name='Timestamp' size-in-bits='64' visibility='default'
> filepath='src/mongo/bson/timestamp.h' line='40' column='1' id='type-id-529'>
>          <data-member access='private' layout-offset-in-bits='0'>
> -          <var-decl name='i' type-id='type-id-25' visibility='default'
> filepath='src/mongo/bson/timestamp.h' line='123' column='1'/>
> +          <var-decl name='i' type-id='type-id-22' visibility='default'
> filepath='src/mongo/bson/timestamp.h' line='123' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='32'>
> -          <var-decl name='secs' type-id='type-id-25' visibility='default'
> filepath='src/mongo/bson/timestamp.h' line='124' column='1'/>
> +          <var-decl name='secs' type-id='type-id-22' visibility='default'
> filepath='src/mongo/bson/timestamp.h' line='124' column='1'/>
>          </data-member>
>          <member-function access='public' static='yes'>
>            <function-decl name='max'
> mangled-name='_ZN5mongo9Timestamp3maxEv'
> filepath='src/mongo/bson/timestamp.h' line='43' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -32463,7 +32463,7 @@
>          <member-function access='public' constructor='yes'>
>            <function-decl name='Timestamp'
> filepath='src/mongo/bson/timestamp.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1581' is-artificial='yes'/>
> -            <parameter type-id='type-id-34'/>
> +            <parameter type-id='type-id-32'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -32471,15 +32471,15 @@
>            <function-decl name='Timestamp'
> filepath='src/mongo/bson/timestamp.h' line='59' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1581' is-artificial='yes'/>
>              <parameter type-id='type-id-3096'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' constructor='yes'>
>            <function-decl name='Timestamp'
> filepath='src/mongo/bson/timestamp.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1581' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -32492,25 +32492,25 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='getSecs'
> mangled-name='_ZNK5mongo9Timestamp7getSecsEv'
> filepath='src/mongo/bson/timestamp.h' line='67' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-532' is-artificial='yes'/>
> -            <return type-id='type-id-25'/>
> +            <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='getInc'
> mangled-name='_ZNK5mongo9Timestamp6getIncEv'
> filepath='src/mongo/bson/timestamp.h' line='71' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-532' is-artificial='yes'/>
> -            <return type-id='type-id-25'/>
> +            <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='asULL'
> mangled-name='_ZNK5mongo9Timestamp5asULLEv'
> filepath='src/mongo/bson/timestamp.h' line='75' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-532' is-artificial='yes'/>
> -            <return type-id='type-id-34'/>
> +            <return type-id='type-id-32'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='asLL'
> mangled-name='_ZNK5mongo9Timestamp4asLLEv'
> filepath='src/mongo/bson/timestamp.h' line='81' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-532' is-artificial='yes'/>
> -            <return type-id='type-id-33'/>
> +            <return type-id='type-id-31'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
> @@ -32600,12 +32600,12 @@
>        <typedef-decl name='BSONElementMSet' type-id='type-id-2626'
> filepath='src/mongo/bson/bsonobj.h' line='53' column='1' id='type-id-1506'/>
>        <class-decl name='Ordering' size-in-bits='32' visibility='default'
> filepath='src/mongo/bson/ordering.h' line='43' column='1' id='type-id-500'>
>          <data-member access='private' layout-offset-in-bits='0'>
> -          <var-decl name='bits' type-id='type-id-25' visibility='default'
> filepath='src/mongo/bson/ordering.h' line='44' column='1'/>
> +          <var-decl name='bits' type-id='type-id-22' visibility='default'
> filepath='src/mongo/bson/ordering.h' line='44' column='1'/>
>          </data-member>
>          <member-function access='private' constructor='yes'>
>            <function-decl name='Ordering'
> filepath='src/mongo/bson/ordering.h' line='45' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1558' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -32626,15 +32626,15 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='get'
> mangled-name='_ZNK5mongo8Ordering3getEi'
> filepath='src/mongo/bson/ordering.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-503' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> -            <return type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='descending'
> mangled-name='_ZNK5mongo8Ordering10descendingEj'
> filepath='src/mongo/bson/ordering.h' line='62' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-503' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> -            <return type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
> +            <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
> @@ -32706,7 +32706,7 @@
>          <member-function access='public'>
>            <function-decl name='operator++'
> mangled-name='_ZN5mongo15BSONObjIteratorppEi'
> filepath='src/mongo/bson/bsonobj.h' line='702' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1521' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-413'/>
>            </function-decl>
>          </member-function>
> @@ -32733,13 +32733,13 @@
>        </class-decl>
>        <class-decl name='BufReader' size-in-bits='192'
> visibility='default' filepath='src/mongo/util/bufreader.h' line='42'
> column='1' id='type-id-426'>
>          <data-member access='private' layout-offset-in-bits='0'>
> -          <var-decl name='_start' type-id='type-id-26'
> visibility='default' filepath='src/mongo/util/bufreader.h' line='145'
> column='1'/>
> +          <var-decl name='_start' type-id='type-id-23'
> visibility='default' filepath='src/mongo/util/bufreader.h' line='145'
> column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='64'>
> -          <var-decl name='_pos' type-id='type-id-26' visibility='default'
> filepath='src/mongo/util/bufreader.h' line='146' column='1'/>
> +          <var-decl name='_pos' type-id='type-id-23' visibility='default'
> filepath='src/mongo/util/bufreader.h' line='146' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='128'>
> -          <var-decl name='_end' type-id='type-id-26' visibility='default'
> filepath='src/mongo/util/bufreader.h' line='147' column='1'/>
> +          <var-decl name='_end' type-id='type-id-23' visibility='default'
> filepath='src/mongo/util/bufreader.h' line='147' column='1'/>
>          </data-member>
>          <member-function access='private' constructor='yes'>
>            <function-decl name='BufReader'
> filepath='src/mongo/util/bufreader.h' line='43' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -32758,8 +32758,8 @@
>          <member-function access='public' constructor='yes'>
>            <function-decl name='BufReader'
> filepath='src/mongo/util/bufreader.h' line='54' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1529' is-artificial='yes'/>
> -            <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-23'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -32772,27 +32772,27 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='offset'
> mangled-name='_ZNK5mongo9BufReader6offsetEv'
> filepath='src/mongo/util/bufreader.h' line='98' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-429' is-artificial='yes'/>
> -            <return type-id='type-id-25'/>
> +            <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='remaining'
> mangled-name='_ZNK5mongo9BufReader9remainingEv'
> filepath='src/mongo/util/bufreader.h' line='103' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-429' is-artificial='yes'/>
> -            <return type-id='type-id-25'/>
> +            <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='rewind'
> mangled-name='_ZN5mongo9BufReader6rewindEj'
> filepath='src/mongo/util/bufreader.h' line='108' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1529' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='skip'
> mangled-name='_ZN5mongo9BufReader4skipEj'
> filepath='src/mongo/util/bufreader.h' line='114' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1529' is-artificial='yes'/>
> -            <parameter type-id='type-id-25'/>
> -            <return type-id='type-id-26'/>
> +            <parameter type-id='type-id-22'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
> @@ -32811,13 +32811,13 @@
>          <member-function access='public'>
>            <function-decl name='pos'
> mangled-name='_ZN5mongo9BufReader3posEv'
> filepath='src/mongo/util/bufreader.h' line='137' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1529' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='start'
> mangled-name='_ZN5mongo9BufReader5startEv'
> filepath='src/mongo/util/bufreader.h' line='140' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1529' is-artificial='yes'/>
> -            <return type-id='type-id-26'/>
> +            <return type-id='type-id-23'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -32886,7 +32886,7 @@
>          <return type-id='type-id-517'/>
>        </function-decl>
>        <function-decl name='tagLittleEndian&lt;int&gt;'
> mangled-name='_ZN5mongo15tagLittleEndianIiEENS_12LittleEndianIT_EES2_'
> filepath='src/mongo/base/data_type_endian.h' line='67' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15tagLittleEndianIiEENS_12LittleEndianIT_EES2_'>
> -        <parameter type-id='type-id-29'/>
> +        <parameter type-id='type-id-26'/>
>          <return type-id='type-id-483'/>
>        </function-decl>
>        <function-decl name='tagLittleEndian&lt;char&gt;'
> mangled-name='_ZN5mongo15tagLittleEndianIcEENS_12LittleEndianIT_EES2_'
> filepath='src/mongo/base/data_type_endian.h' line='67' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15tagLittleEndianIcEENS_12LittleEndianIT_EES2_'>
> @@ -32901,7 +32901,7 @@
>            <var-decl name='_buf' type-id='type-id-1527'
> visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='728'
> column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='320'>
> -          <var-decl name='_offset' type-id='type-id-29'
> visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='729'
> column='1'/>
> +          <var-decl name='_offset' type-id='type-id-26'
> visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='729'
> column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='384'>
>            <var-decl name='_s' type-id='type-id-409' visibility='default'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='730' column='1'/>
> @@ -32913,7 +32913,7 @@
>            <var-decl name='_doneCalled' type-id='type-id-1'
> visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='732'
> column='1'/>
>          </data-member>
>          <data-member access='private' static='yes'>
> -          <var-decl name='numStrs' type-id='type-id-38'
> visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='734'
> column='1'/>
> +          <var-decl name='numStrs' type-id='type-id-36'
> visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='734'
> column='1'/>
>          </data-member>
>          <data-member access='private' static='yes'>
>            <var-decl name='numStrsReady' type-id='type-id-1'
> visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='735'
> column='1'/>
> @@ -32935,7 +32935,7 @@
>          <member-function access='public' constructor='yes'>
>            <function-decl name='BSONObjBuilder'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='64' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -32956,7 +32956,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~BSONObjBuilder'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='115' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -33002,7 +33002,7 @@
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
>              <parameter type-id='type-id-84'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33040,7 +33040,7 @@
>            <function-decl name='appendBool'
> mangled-name='_ZN5mongo14BSONObjBuilder10appendBoolENS_10StringDataEi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='211' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33056,7 +33056,7 @@
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='227' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33064,7 +33064,7 @@
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEj'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='235' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-25'/>
> +            <parameter type-id='type-id-22'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33080,7 +33080,7 @@
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEx'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='248' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-33'/>
> +            <parameter type-id='type-id-31'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33088,7 +33088,7 @@
>            <function-decl name='appendIntOrLL'
> mangled-name='_ZN5mongo14BSONObjBuilder13appendIntOrLLENS_10StringDataEx'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='256' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-33'/>
> +            <parameter type-id='type-id-31'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33096,7 +33096,7 @@
>            <function-decl name='appendNumber'
> mangled-name='_ZN5mongo14BSONObjBuilder12appendNumberENS_10StringDataEi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='272' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33104,7 +33104,7 @@
>            <function-decl name='appendNumber'
> mangled-name='_ZN5mongo14BSONObjBuilder12appendNumberENS_10StringDataEd'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='276' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-27'/>
> +            <parameter type-id='type-id-24'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33128,7 +33128,7 @@
>            <function-decl name='appendNumber'
> mangled-name='_ZN5mongo14BSONObjBuilder12appendNumberENS_10StringDataEx'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='293' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-33'/>
> +            <parameter type-id='type-id-31'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33136,7 +33136,7 @@
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEd'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='311' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-27'/>
> +            <parameter type-id='type-id-24'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33225,7 +33225,7 @@
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
>              <parameter type-id='type-id-84'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33307,7 +33307,7 @@
>            <function-decl name='appendTimestamp'
> mangled-name='_ZN5mongo14BSONObjBuilder15appendTimestampENS_10StringDataEy'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='471' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-34'/>
> +            <parameter type-id='type-id-32'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33340,9 +33340,9 @@
>            <function-decl name='appendBinData'
> mangled-name='_ZN5mongo14BSONObjBuilder13appendBinDataENS_10StringDataEiNS_11BinDataTypeEPKv'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='503' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-29'/>
> -            <parameter type-id='type-id-3089'/>
>              <parameter type-id='type-id-26'/>
> +            <parameter type-id='type-id-3089'/>
> +            <parameter type-id='type-id-23'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33358,8 +33358,8 @@
>            <function-decl name='appendBinDataArrayDeprecated'
> mangled-name='_ZN5mongo14BSONObjBuilder28appendBinDataArrayDeprecatedEPKcPKvi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='525' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-84'/>
> +            <parameter type-id='type-id-23'/>
>              <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-29'/>
>              <return type-id='type-id-1513'/>
>            </function-decl>
>          </member-function>
> @@ -33399,7 +33399,7 @@
>            <function-decl name='appendMinForType'
> mangled-name='_ZN5mongo14BSONObjBuilder16appendMinForTypeENS_10StringDataEi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='565' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -33407,7 +33407,7 @@
>            <function-decl name='appendMaxForType'
> mangled-name='_ZN5mongo14BSONObjBuilder16appendMaxForTypeENS_10StringDataEi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='566' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
>              <parameter type-id='type-id-525'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -33457,7 +33457,7 @@
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='numStr'
> mangled-name='_ZN5mongo14BSONObjBuilder6numStrEi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='642' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder6numStrEi'>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-1336'/>
>            </function-decl>
>          </member-function>
> @@ -33517,7 +33517,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='len'
> mangled-name='_ZNK5mongo14BSONObjBuilder3lenEv'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='697' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-408' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
> @@ -33543,14 +33543,14 @@
>          <member-function access='public' constructor='yes'>
>            <function-decl name='BSONObjBuilder'
> mangled-name='_ZN5mongo14BSONObjBuilderC2Ei'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='64' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilderC1Ei'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~BSONObjBuilder'
> mangled-name='_ZN5mongo14BSONObjBuilderD2Ev'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='115' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilderD1Ev'>
>              <parameter type-id='type-id-1514' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -33729,10 +33729,10 @@
>            </enum-decl>
>          </member-type>
>          <data-member access='private' layout-offset-in-bits='0'>
> -          <var-decl name='_pos' type-id='type-id-29' visibility='default'
> filepath='src/mongo/bson/bsonmisc.h' line='300' column='1'/>
> +          <var-decl name='_pos' type-id='type-id-26' visibility='default'
> filepath='src/mongo/bson/bsonmisc.h' line='300' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='32'>
> -          <var-decl name='_sizes' type-id='type-id-30'
> visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='301'
> column='1'/>
> +          <var-decl name='_sizes' type-id='type-id-27'
> visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='301'
> column='1'/>
>          </data-member>
>          <member-function access='public' constructor='yes'>
>            <function-decl name='BSONSizeTracker'
> filepath='src/mongo/bson/bsonmisc.h' line='273' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -33743,21 +33743,21 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~BSONSizeTracker'
> filepath='src/mongo/bson/bsonmisc.h' line='279' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1523' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='got'
> mangled-name='_ZN5mongo15BSONSizeTracker3gotEi'
> filepath='src/mongo/bson/bsonmisc.h' line='281' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15BSONSizeTracker3gotEi'>
>              <parameter type-id='type-id-1523' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes'>
>            <function-decl name='getSize'
> mangled-name='_ZNK5mongo15BSONSizeTracker7getSizeEv'
> filepath='src/mongo/bson/bsonmisc.h' line='289' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-422' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -33835,10 +33835,10 @@
>        </class-decl>
>        <class-decl name='BSONBinData' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='179'
> column='1' id='type-id-382'>
>          <data-member access='public' layout-offset-in-bits='0'>
> -          <var-decl name='data' type-id='type-id-26' visibility='default'
> filepath='src/mongo/bson/bsonmisc.h' line='181' column='1'/>
> +          <var-decl name='data' type-id='type-id-23' visibility='default'
> filepath='src/mongo/bson/bsonmisc.h' line='181' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='64'>
> -          <var-decl name='length' type-id='type-id-29'
> visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='182'
> column='1'/>
> +          <var-decl name='length' type-id='type-id-26'
> visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='182'
> column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='96'>
>            <var-decl name='type' type-id='type-id-3089'
> visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='183'
> column='1'/>
> @@ -33846,8 +33846,8 @@
>          <member-function access='public' constructor='yes'>
>            <function-decl name='BSONBinData'
> filepath='src/mongo/bson/bsonmisc.h' line='180' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1500' is-artificial='yes'/>
> +            <parameter type-id='type-id-23'/>
>              <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-29'/>
>              <parameter type-id='type-id-3089'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
> @@ -33896,7 +33896,7 @@
>            <var-decl name='msg' type-id='type-id-1336'
> visibility='default' filepath='src/mongo/util/assert_util.h' line='89'
> column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='64'>
> -          <var-decl name='code' type-id='type-id-29' visibility='default'
> filepath='src/mongo/util/assert_util.h' line='90' column='1'/>
> +          <var-decl name='code' type-id='type-id-26' visibility='default'
> filepath='src/mongo/util/assert_util.h' line='90' column='1'/>
>          </data-member>
>          <member-function access='public' constructor='yes'>
>            <function-decl name='ExceptionInfo'
> filepath='src/mongo/util/assert_util.h' line='77' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -33908,7 +33908,7 @@
>            <function-decl name='ExceptionInfo'
> filepath='src/mongo/util/assert_util.h' line='78' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1538' is-artificial='yes'/>
>              <parameter type-id='type-id-84'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -33916,7 +33916,7 @@
>            <function-decl name='ExceptionInfo'
> filepath='src/mongo/util/assert_util.h' line='79' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1538' is-artificial='yes'/>
>              <parameter type-id='type-id-1338'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -33951,7 +33951,7 @@
>            <function-decl name='ExceptionInfo'
> mangled-name='_ZN5mongo13ExceptionInfoC2ERKSsi'
> filepath='src/mongo/util/assert_util.h' line='79' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo13ExceptionInfoC1ERKSsi'>
>              <parameter type-id='type-id-1538' is-artificial='yes'/>
>              <parameter type-id='type-id-1338'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -33961,7 +33961,7 @@
>            <function-decl name='DBException'
> filepath='src/mongo/util/assert_util.h' line='106' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1531' is-artificial='yes'/>
>              <parameter type-id='type-id-1338'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -33969,28 +33969,28 @@
>            <function-decl name='DBException'
> mangled-name='_ZN5mongo11DBExceptionC2ERKSsi'
> filepath='src/mongo/util/assert_util.h' line='106' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11DBExceptionC2ERKSsi'>
>              <parameter type-id='type-id-1531' is-artificial='yes'/>
>              <parameter type-id='type-id-1338'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~DBException'
> filepath='src/mongo/util/assert_util.h' line='109' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1531' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~DBException'
> mangled-name='_ZN5mongo11DBExceptionD0Ev'
> filepath='src/mongo/util/assert_util.h' line='109' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11DBExceptionD0Ev'>
>              <parameter type-id='type-id-1531' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~DBException'
> mangled-name='_ZN5mongo11DBExceptionD2Ev'
> filepath='src/mongo/util/assert_util.h' line='109' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11DBExceptionD1Ev'>
>              <parameter type-id='type-id-1531' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -34003,7 +34003,7 @@
>          <member-function access='public' const='yes' vtable-offset='3'>
>            <function-decl name='getCode'
> mangled-name='_ZNK5mongo11DBException7getCodeEv'
> filepath='src/mongo/util/assert_util.h' line='114' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo11DBException7getCodeEv'>
>              <parameter type-id='type-id-436' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' const='yes' vtable-offset='4'>
> @@ -34034,7 +34034,7 @@
>            <function-decl name='AssertionException'
> filepath='src/mongo/util/assert_util.h' line='154' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1496' is-artificial='yes'/>
>              <parameter type-id='type-id-84'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -34042,7 +34042,7 @@
>            <function-decl name='AssertionException'
> filepath='src/mongo/util/assert_util.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1496' is-artificial='yes'/>
>              <parameter type-id='type-id-1338'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -34050,28 +34050,28 @@
>            <function-decl name='AssertionException'
> mangled-name='_ZN5mongo18AssertionExceptionC2ERKSsi'
> filepath='src/mongo/util/assert_util.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo18AssertionExceptionC1ERKSsi'>
>              <parameter type-id='type-id-1496' is-artificial='yes'/>
>              <parameter type-id='type-id-1338'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~AssertionException'
> filepath='src/mongo/util/assert_util.h' line='157' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1496' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~AssertionException'
> mangled-name='_ZN5mongo18AssertionExceptionD0Ev'
> filepath='src/mongo/util/assert_util.h' line='157' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo18AssertionExceptionD0Ev'>
>              <parameter type-id='type-id-1496' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~AssertionException'
> mangled-name='_ZN5mongo18AssertionExceptionD2Ev'
> filepath='src/mongo/util/assert_util.h' line='157' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo18AssertionExceptionD1Ev'>
>              <parameter type-id='type-id-1496' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -34092,7 +34092,7 @@
>          <member-function access='public' constructor='yes'>
>            <function-decl name='MsgAssertionException'
> filepath='src/mongo/util/assert_util.h' line='183' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1553' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <parameter type-id='type-id-1338'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
> @@ -34100,7 +34100,7 @@
>          <member-function access='public' constructor='yes'>
>            <function-decl name='MsgAssertionException'
> mangled-name='_ZN5mongo21MsgAssertionExceptionC2EiRKSs'
> filepath='src/mongo/util/assert_util.h' line='183' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo21MsgAssertionExceptionC2EiRKSs'>
>              <parameter type-id='type-id-1553' is-artificial='yes'/>
> -            <parameter type-id='type-id-29'/>
> +            <parameter type-id='type-id-26'/>
>              <parameter type-id='type-id-1338'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
> @@ -34120,7 +34120,7 @@
>            <var-decl name='authdPath' type-id='type-id-1336'
> visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='49'
> column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='384'>
> -          <var-decl name='scramIterationCount' type-id='type-id-29'
> visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='50'
> column='1'/>
> +          <var-decl name='scramIterationCount' type-id='type-id-26'
> visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='50'
> column='1'/>
>          </data-member>
>          <member-function access='public' constructor='yes'>
>            <function-decl name='SASLGlobalParams'
> filepath='src/mongo/db/auth/sasl_options.h' line='52' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -34187,21 +34187,21 @@
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1541' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> mangled-name='_ZN5mongo23ExportedServerParameterIiED0Ev'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo23ExportedServerParameterIiED0Ev'>
>              <parameter type-id='type-id-1541' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> mangled-name='_ZN5mongo23ExportedServerParameterIiED2Ev'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo23ExportedServerParameterIiED2Ev'>
>              <parameter type-id='type-id-1541' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -34307,21 +34307,21 @@
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1543' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEED0Ev'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEED0Ev'>
>              <parameter type-id='type-id-1543' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEED2Ev'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEED1Ev'>
>              <parameter type-id='type-id-1543' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -34399,21 +34399,21 @@
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-1542' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> mangled-name='_ZN5mongo23ExportedServerParameterISsED0Ev'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo23ExportedServerParameterISsED0Ev'>
>              <parameter type-id='type-id-1542' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>            <function-decl name='~ExportedServerParameter'
> mangled-name='_ZN5mongo23ExportedServerParameterISsED2Ev'
> filepath='src/mongo/db/server_parameters.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo23ExportedServerParameterISsED1Ev'>
>              <parameter type-id='type-id-1542' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -34547,7 +34547,7 @@
>              </member-function>
>              <member-function access='public' static='yes'>
>                <function-decl name='defaultConstruct'
> mangled-name='_ZN5mongo8DataType7HandlerIivE16defaultConstructEv'
> filepath='src/mongo/base/data_type.h' line='120' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo8DataType7HandlerIivE16defaultConstructEv'>
> -                <return type-id='type-id-29'/>
> +                <return type-id='type-id-26'/>
>                </function-decl>
>              </member-function>
>            </class-decl>
> @@ -34681,7 +34681,7 @@
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='defaultConstruct&lt;int&gt;'
> mangled-name='_ZN5mongo8DataType16defaultConstructIiEET_v'
> filepath='src/mongo/base/data_type.h' line='159' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo8DataType16defaultConstructIiEET_v'>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
> @@ -34870,8 +34870,8 @@
>            <member-function access='public' constructor='yes'>
>              <function-decl name='options_description'
> filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp'
> line='178' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-200' is-artificial='yes'/>
> -              <parameter type-id='type-id-25'/>
> -              <parameter type-id='type-id-25'/>
> +              <parameter type-id='type-id-22'/>
> +              <parameter type-id='type-id-22'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -34879,8 +34879,8 @@
>              <function-decl name='options_description'
> filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp'
> line='187' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-200' is-artificial='yes'/>
>                <parameter type-id='type-id-1338'/>
> -              <parameter type-id='type-id-25'/>
> -              <parameter type-id='type-id-25'/>
> +              <parameter type-id='type-id-22'/>
> +              <parameter type-id='type-id-22'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -34901,7 +34901,7 @@
>            <member-function access='public' const='yes'>
>              <function-decl name='get_option_column_width'
> mangled-name='_ZNK5boost15program_options19options_description23get_option_column_widthEv'
> filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp'
> line='204' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-349' is-artificial='yes'/>
> -              <return type-id='type-id-25'/>
> +              <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
> @@ -34940,7 +34940,7 @@
>              <function-decl name='print'
> mangled-name='_ZNK5boost15program_options19options_description5printERSoj'
> filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp'
> line='236' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-349' is-artificial='yes'/>
>                <parameter type-id='type-id-2054'/>
> -              <parameter type-id='type-id-25'/>
> +              <parameter type-id='type-id-22'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -34986,7 +34986,7 @@
>            <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>              <function-decl name='~value_semantic'
> filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp'
> line='71' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-208' is-artificial='yes'/>
> -              <parameter type-id='type-id-29' is-artificial='yes'/>
> +              <parameter type-id='type-id-26' is-artificial='yes'/>
>                <return type-id='type-id-56'/>
>              </function-decl>
>            </member-function>
> @@ -34999,13 +34999,13 @@
>            <member-function access='public' const='yes' vtable-offset='1'>
>              <function-decl name='min_tokens'
> mangled-name='_ZNK5boost15program_options14value_semantic10min_tokensEv'
> filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp'
> line='35' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-353' is-artificial='yes'/>
> -              <return type-id='type-id-25'/>
> +              <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes' vtable-offset='2'>
>              <function-decl name='max_tokens'
> mangled-name='_ZNK5boost15program_options14value_semantic10max_tokensEv'
> filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp'
> line='39' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-353' is-artificial='yes'/>
> -              <return type-id='type-id-25'/>
> +              <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes' vtable-offset='3'>
> @@ -35062,20 +35062,20 @@
>              <function-decl name='add'
> mangled-name='_ZN5boost15program_options30positional_options_description3addEPKci'
> filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp'
> line='46' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-206' is-artificial='yes'/>
>                <parameter type-id='type-id-84'/>
> -              <parameter type-id='type-id-29'/>
> +              <parameter type-id='type-id-26'/>
>                <return type-id='type-id-205'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
>              <function-decl name='max_total_count'
> mangled-name='_ZNK5boost15program_options30positional_options_description15max_total_countEv'
> filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp'
> line='51' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-351' is-artificial='yes'/>
> -              <return type-id='type-id-25'/>
> +              <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' const='yes'>
>              <function-decl name='name_for_position'
> mangled-name='_ZNK5boost15program_options30positional_options_description17name_for_positionEj'
> filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp'
> line='57' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>                <parameter type-id='type-id-351' is-artificial='yes'/>
> -              <parameter type-id='type-id-25'/>
> +              <parameter type-id='type-id-22'/>
>                <return type-id='type-id-1338'/>
>              </function-decl>
>            </member-function>
> @@ -35109,7 +35109,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~intrusive_ptr'
> filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='95' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-197' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -35214,7 +35214,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~intrusive_ptr'
> mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEED2Ev'
> filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='95' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEED1Ev'>
>              <parameter type-id='type-id-197' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -35227,7 +35227,7 @@
>              <member-function access='public' destructor='yes'
> vtable-offset='-1'>
>                <function-decl name='~placeholder'
> filepath='src/third_party/boost-1.56.0/boost/any.hpp' line='162' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>                  <parameter type-id='type-id-193' is-artificial='yes'/>
> -                <parameter type-id='type-id-29' is-artificial='yes'/>
> +                <parameter type-id='type-id-26' is-artificial='yes'/>
>                  <return type-id='type-id-56'/>
>                </function-decl>
>              </member-function>
> @@ -35271,7 +35271,7 @@
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~any'
> filepath='src/third_party/boost-1.56.0/boost/any.hpp' line='83' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>              <parameter type-id='type-id-191' is-artificial='yes'/>
> -            <parameter type-id='type-id-29' is-artificial='yes'/>
> +            <parameter type-id='type-id-26' is-artificial='yes'/>
>              <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
> @@ -35317,7 +35317,7 @@
>        </class-decl>
>      </namespace-decl>
>      <function-decl name='btowc' filepath='/usr/include/wchar.h'
> line='353' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <return type-id='type-id-68'/>
>      </function-decl>
>      <function-decl name='fgetwc' filepath='/usr/include/wchar.h'
> line='745' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -35326,7 +35326,7 @@
>      </function-decl>
>      <function-decl name='fgetws' filepath='/usr/include/wchar.h'
> line='774' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2179'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-105'/>
>        <return type-id='type-id-2179'/>
>      </function-decl>
> @@ -35338,24 +35338,24 @@
>      <function-decl name='fputws' filepath='/usr/include/wchar.h'
> line='781' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-105'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='fwide' filepath='/usr/include/wchar.h'
> line='587' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-105'/>
> -      <parameter type-id='type-id-29'/>
> -      <return type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='fwprintf' filepath='/usr/include/wchar.h'
> line='594' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-105'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='fwscanf' filepath='/usr/include/wchar.h'
> line='635' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-105'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='getwc' filepath='/usr/include/wchar.h'
> line='746' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-105'/>
> @@ -35379,7 +35379,7 @@
>      </function-decl>
>      <function-decl name='mbsinit' filepath='/usr/include/wchar.h'
> line='361' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-375'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h'
> line='408' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2179'/>
> @@ -35402,13 +35402,13 @@
>        <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='swscanf' filepath='/usr/include/wchar.h'
> line='645' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='ungetwc' filepath='/usr/include/wchar.h'
> line='789' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-68'/>
> @@ -35419,36 +35419,36 @@
>        <parameter type-id='type-id-105'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2169'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='vfwscanf' filepath='/usr/include/wchar.h'
> line='689' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-105'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2169'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='vswprintf' filepath='/usr/include/wchar.h'
> line='625' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2179'/>
>        <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2169'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='vswscanf' filepath='/usr/include/wchar.h'
> line='701' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2169'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='vwprintf' filepath='/usr/include/wchar.h'
> line='620' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2169'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='vwscanf' filepath='/usr/include/wchar.h'
> line='697' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2169'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcrtomb' filepath='/usr/include/wchar.h'
> line='370' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-71'/>
> @@ -35464,12 +35464,12 @@
>      <function-decl name='wcscmp' filepath='/usr/include/wchar.h'
> line='163' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-1483'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcscoll' filepath='/usr/include/wchar.h'
> line='192' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-1483'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcscpy' filepath='/usr/include/wchar.h'
> line='147' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2179'/>
> @@ -35502,7 +35502,7 @@
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-64'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcsncpy' filepath='/usr/include/wchar.h'
> line='150' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2179'/>
> @@ -35525,12 +35525,12 @@
>      <function-decl name='wcstod' filepath='/usr/include/wchar.h'
> line='450' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2180'/>
> -      <return type-id='type-id-27'/>
> +      <return type-id='type-id-24'/>
>      </function-decl>
>      <function-decl name='wcstof' filepath='/usr/include/wchar.h'
> line='457' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2180'/>
> -      <return type-id='type-id-28'/>
> +      <return type-id='type-id-25'/>
>      </function-decl>
>      <function-decl name='wcstok' filepath='/usr/include/wchar.h'
> line='282' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2179'/>
> @@ -35541,13 +35541,13 @@
>      <function-decl name='wcstol' filepath='/usr/include/wchar.h'
> line='468' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2180'/>
> -      <parameter type-id='type-id-29'/>
> -      <return type-id='type-id-23'/>
> +      <parameter type-id='type-id-26'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <function-decl name='wcstoul' filepath='/usr/include/wchar.h'
> line='473' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2180'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <return type-id='type-id-50'/>
>      </function-decl>
>      <function-decl name='wcsxfrm' filepath='/usr/include/wchar.h'
> line='196' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -35558,13 +35558,13 @@
>      </function-decl>
>      <function-decl name='wctob' filepath='/usr/include/wchar.h'
> line='357' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-68'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wmemcmp' filepath='/usr/include/wchar.h'
> line='325' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-64'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wmemcpy' filepath='/usr/include/wchar.h'
> line='329' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2179'/>
> @@ -35587,12 +35587,12 @@
>      <function-decl name='wprintf' filepath='/usr/include/wchar.h'
> line='601' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wscanf' filepath='/usr/include/wchar.h'
> line='642' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter is-variadic='yes'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcschr' mangled-name='wcschr'
> filepath='/usr/include/wchar.h' line='224' column='1' visibility='default'
> binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
> @@ -35623,22 +35623,22 @@
>      <function-decl name='wcstold' filepath='/usr/include/wchar.h'
> line='459' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2180'/>
> -      <return type-id='type-id-32'/>
> +      <return type-id='type-id-29'/>
>      </function-decl>
>      <function-decl name='wcstoll' filepath='/usr/include/wchar.h'
> line='483' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2180'/>
> -      <parameter type-id='type-id-29'/>
> -      <return type-id='type-id-33'/>
> +      <parameter type-id='type-id-26'/>
> +      <return type-id='type-id-31'/>
>      </function-decl>
>      <function-decl name='wcstoull' filepath='/usr/include/wchar.h'
> line='490' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-1483'/>
>        <parameter type-id='type-id-2180'/>
> -      <parameter type-id='type-id-29'/>
> -      <return type-id='type-id-34'/>
> +      <parameter type-id='type-id-26'/>
> +      <return type-id='type-id-32'/>
>      </function-decl>
>      <function-decl name='setlocale' filepath='/usr/include/locale.h'
> line='124' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-84'/>
>        <return type-id='type-id-71'/>
>      </function-decl>
> @@ -35647,35 +35647,35 @@
>      </function-decl>
>      <function-decl name='atexit' filepath='/usr/include/stdlib.h'
> line='519' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2177'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='at_quick_exit' mangled-name='at_quick_exit'
> filepath='/usr/include/stdlib.h' line='524' column='1' visibility='default'
> binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-2177'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='atof' filepath='/usr/include/stdlib.h'
> line='144' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
> -      <return type-id='type-id-27'/>
> +      <return type-id='type-id-24'/>
>      </function-decl>
>      <function-decl name='atoi' filepath='/usr/include/stdlib.h'
> line='147' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='atol' filepath='/usr/include/stdlib.h'
> line='150' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
> -      <return type-id='type-id-23'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <function-decl name='bsearch' filepath='/usr/include/stdlib.h'
> line='754' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-26'/>
> +      <parameter type-id='type-id-23'/>
> +      <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-87'/>
> -      <return type-id='type-id-26'/>
> +      <return type-id='type-id-23'/>
>      </function-decl>
>      <function-decl name='div' filepath='/usr/include/stdlib.h' line='788'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-29'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
> +      <parameter type-id='type-id-26'/>
>        <return type-id='type-id-89'/>
>      </function-decl>
>      <function-decl name='getenv' filepath='/usr/include/stdlib.h'
> line='564' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -35683,14 +35683,14 @@
>        <return type-id='type-id-71'/>
>      </function-decl>
>      <function-decl name='ldiv' filepath='/usr/include/stdlib.h'
> line='790' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-23'/>
> -      <parameter type-id='type-id-23'/>
> +      <parameter type-id='type-id-30'/>
> +      <parameter type-id='type-id-30'/>
>        <return type-id='type-id-91'/>
>      </function-decl>
>      <function-decl name='mblen' filepath='/usr/include/stdlib.h'
> line='862' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-64'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h'
> line='873' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2179'/>
> @@ -35702,46 +35702,46 @@
>        <parameter type-id='type-id-2179'/>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-64'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='qsort' filepath='/usr/include/stdlib.h'
> line='764' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-26'/>
> +      <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-87'/>
>        <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='quick_exit' filepath='/usr/include/stdlib.h'
> line='549' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='rand' filepath='/usr/include/stdlib.h'
> line='374' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='srand' filepath='/usr/include/stdlib.h'
> line='376' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-25'/>
> +      <parameter type-id='type-id-22'/>
>        <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strtod' filepath='/usr/include/stdlib.h'
> line='164' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-218'/>
> -      <return type-id='type-id-27'/>
> +      <return type-id='type-id-24'/>
>      </function-decl>
>      <function-decl name='strtol' filepath='/usr/include/stdlib.h'
> line='183' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-218'/>
> -      <parameter type-id='type-id-29'/>
> -      <return type-id='type-id-23'/>
> +      <parameter type-id='type-id-26'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <function-decl name='strtoul' filepath='/usr/include/stdlib.h'
> line='187' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-218'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <return type-id='type-id-50'/>
>      </function-decl>
>      <function-decl name='system' filepath='/usr/include/stdlib.h'
> line='716' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcstombs' filepath='/usr/include/stdlib.h'
> line='876' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-71'/>
> @@ -35752,38 +35752,38 @@
>      <function-decl name='wctomb' filepath='/usr/include/stdlib.h'
> line='869' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-71'/>
>        <parameter type-id='type-id-57'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='lldiv' filepath='/usr/include/stdlib.h'
> line='796' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-33'/>
> -      <parameter type-id='type-id-33'/>
> +      <parameter type-id='type-id-31'/>
> +      <parameter type-id='type-id-31'/>
>        <return type-id='type-id-59'/>
>      </function-decl>
>      <function-decl name='atoll' filepath='/usr/include/stdlib.h'
> line='157' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
> -      <return type-id='type-id-33'/>
> +      <return type-id='type-id-31'/>
>      </function-decl>
>      <function-decl name='strtoll' filepath='/usr/include/stdlib.h'
> line='209' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-218'/>
> -      <parameter type-id='type-id-29'/>
> -      <return type-id='type-id-33'/>
> +      <parameter type-id='type-id-26'/>
> +      <return type-id='type-id-31'/>
>      </function-decl>
>      <function-decl name='strtoull' filepath='/usr/include/stdlib.h'
> line='214' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-218'/>
> -      <parameter type-id='type-id-29'/>
> -      <return type-id='type-id-34'/>
> +      <parameter type-id='type-id-26'/>
> +      <return type-id='type-id-32'/>
>      </function-decl>
>      <function-decl name='strtof' filepath='/usr/include/stdlib.h'
> line='172' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-218'/>
> -      <return type-id='type-id-28'/>
> +      <return type-id='type-id-25'/>
>      </function-decl>
>      <function-decl name='strtold' filepath='/usr/include/stdlib.h'
> line='175' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-218'/>
> -      <return type-id='type-id-32'/>
> +      <return type-id='type-id-29'/>
>      </function-decl>
>      <function-decl name='clearerr' filepath='/usr/include/stdio.h'
> line='826' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> @@ -35791,32 +35791,32 @@
>      </function-decl>
>      <function-decl name='fclose' filepath='/usr/include/stdio.h'
> line='237' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='feof' filepath='/usr/include/stdio.h' line='828'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='ferror' filepath='/usr/include/stdio.h'
> line='830' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='fflush' filepath='/usr/include/stdio.h'
> line='242' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='fgetc' filepath='/usr/include/stdio.h'
> line='531' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='fgetpos' filepath='/usr/include/stdio.h'
> line='798' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
>        <parameter type-id='type-id-1487'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='fgets' filepath='/usr/include/stdio.h'
> line='622' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-71'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-104'/>
>        <return type-id='type-id-71'/>
>      </function-decl>
> @@ -35826,7 +35826,7 @@
>        <return type-id='type-id-104'/>
>      </function-decl>
>      <function-decl name='fread' filepath='/usr/include/stdio.h'
> line='709' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-26'/>
> +      <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-104'/>
> @@ -35840,25 +35840,25 @@
>      </function-decl>
>      <function-decl name='fseek' filepath='/usr/include/stdio.h'
> line='749' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> -      <parameter type-id='type-id-23'/>
> -      <parameter type-id='type-id-29'/>
> -      <return type-id='type-id-29'/>
> +      <parameter type-id='type-id-30'/>
> +      <parameter type-id='type-id-26'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='fsetpos' filepath='/usr/include/stdio.h'
> line='803' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
>        <parameter type-id='type-id-367'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='ftell' filepath='/usr/include/stdio.h'
> line='754' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> -      <return type-id='type-id-23'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <function-decl name='getc' filepath='/usr/include/stdio.h' line='532'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='getchar' filepath='/usr/include/stdio.h'
> line='538' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='gets' filepath='/usr/include/stdio.h' line='638'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-71'/>
> @@ -35870,12 +35870,12 @@
>      </function-decl>
>      <function-decl name='remove' filepath='/usr/include/stdio.h'
> line='178' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='rename' filepath='/usr/include/stdio.h'
> line='180' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-84'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='rewind' filepath='/usr/include/stdio.h'
> line='759' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
> @@ -35889,9 +35889,9 @@
>      <function-decl name='setvbuf' filepath='/usr/include/stdio.h'
> line='336' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-104'/>
>        <parameter type-id='type-id-71'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-64'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='tmpfile' filepath='/usr/include/stdio.h'
> line='195' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <return type-id='type-id-104'/>
> @@ -35901,29 +35901,29 @@
>        <return type-id='type-id-71'/>
>      </function-decl>
>      <function-decl name='ungetc' filepath='/usr/include/stdio.h'
> line='702' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-104'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='memchr' mangled-name='memchr'
> filepath='/usr/include/string.h' line='78' column='1' visibility='default'
> binding='global' size-in-bits='64'>
> +      <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-29'/>
>        <parameter type-id='type-id-64'/>
> -      <return type-id='type-id-26'/>
> +      <return type-id='type-id-23'/>
>      </function-decl>
>      <function-decl name='memcmp' filepath='/usr/include/string.h'
> line='69' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-26'/>
> +      <parameter type-id='type-id-23'/>
> +      <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-64'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='strcoll' filepath='/usr/include/string.h'
> line='151' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
>        <parameter type-id='type-id-84'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='strerror' filepath='/usr/include/string.h'
> line='412' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <return type-id='type-id-71'/>
>      </function-decl>
>      <function-decl name='strtok' filepath='/usr/include/string.h'
> line='347' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -35939,7 +35939,7 @@
>      </function-decl>
>      <function-decl name='strchr' mangled-name='strchr'
> filepath='/usr/include/string.h' line='217' column='1' visibility='default'
> binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <return type-id='type-id-84'/>
>      </function-decl>
>      <function-decl name='strpbrk' mangled-name='strpbrk'
> filepath='/usr/include/string.h' line='296' column='1' visibility='default'
> binding='global' size-in-bits='64'>
> @@ -35949,7 +35949,7 @@
>      </function-decl>
>      <function-decl name='strrchr' mangled-name='strrchr'
> filepath='/usr/include/string.h' line='244' column='1' visibility='default'
> binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-84'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-26'/>
>        <return type-id='type-id-84'/>
>      </function-decl>
>      <function-decl name='strstr' mangled-name='strstr'
> filepath='/usr/include/string.h' line='323' column='1' visibility='default'
> binding='global' size-in-bits='64'>
> @@ -35960,7 +35960,7 @@
>      <function-decl name='iswctype' filepath='/usr/include/wctype.h'
> line='175' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-68'/>
>        <parameter type-id='type-id-96'/>
> -      <return type-id='type-id-29'/>
> +      <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='towctrans' filepath='/usr/include/wctype.h'
> line='221' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-68'/>
> @@ -36016,7 +36016,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi3EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-625' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36027,7 +36027,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILin1EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-601' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36038,7 +36038,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi1EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-619' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36071,7 +36071,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi2EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-622' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36082,7 +36082,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi5EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-631' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36093,7 +36093,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi4EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-628' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36104,7 +36104,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi6EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-634' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36115,7 +36115,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi7EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-637' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36126,7 +36126,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi8EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-640' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36137,7 +36137,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi9EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-643' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36148,7 +36148,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi10EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-607' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36159,7 +36159,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi11EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-610' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36170,7 +36170,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi12EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-613' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36181,7 +36181,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi13EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-616' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36192,7 +36192,7 @@
>          <member-function access='public' const='yes'>
>            <function-decl name='operator int'
> mangled-name='_ZNK4mpl_4int_ILi0EEcviEv'
> filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp'
> line='80' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-604' is-artificial='yes'/>
> -            <return type-id='type-id-29'/>
> +            <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -36203,7 +36203,7 @@
>      <function-decl name='difftime' filepath='/usr/include/time.h'
> line='195' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-62'/>
>        <parameter type-id='type-id-62'/>
> -      <return type-id='type-id-27'/>
> +      <return type-id='type-id-24'/>
>      </function-decl>
>      <function-decl name='mktime' filepath='/usr/include/time.h'
> line='199' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-2168'/>
> @@ -36274,12 +36274,12 @@
>      </namespace-decl>
>      <function-decl name='operator new' mangled-name='_ZnwmPv'
> filepath='/usr/include/c++/4.9/new' line='146' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZnwmPv'>
>        <parameter type-id='type-id-1334'/>
> -      <parameter type-id='type-id-26' name='__p'
> filepath='/usr/include/c++/4.9/new' line='146' column='1'/>
> -      <return type-id='type-id-26'/>
> +      <parameter type-id='type-id-23' name='__p'
> filepath='/usr/include/c++/4.9/new' line='146' column='1'/>
> +      <return type-id='type-id-23'/>
>      </function-decl>
>      <function-decl name='operator delete' mangled-name='_ZdlPvS_'
> filepath='/usr/include/c++/4.9/new' line='152' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZdlPvS_'>
> -      <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-26'/>
> +      <parameter type-id='type-id-23'/>
> +      <parameter type-id='type-id-23'/>
>        <return type-id='type-id-56'/>
>      </function-decl>
>      <function-type size-in-bits='64' id='type-id-184'>
> @@ -36298,9 +36298,9 @@
>        <return type-id='type-id-517'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1488'>
> -      <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-29'/>
> +      <parameter type-id='type-id-23'/>
> +      <parameter type-id='type-id-23'/>
> +      <return type-id='type-id-26'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-2018'>
>        <parameter type-id='type-id-2017'/>
> --
> 1.8.3.1
>
>
> --
>                 Dodji
>
>
Dodji Seketeli Sept. 10, 2020, 2:25 p.m. UTC | #2
Hello,

Giuliano Procida <gprocida@google.com> writes:

[...]

> It's not totally clear from the commit message whether the external or
> internal pretty name is being discussed in places. It's the internal pretty
> name that has changed to match the external one.

Right, thanks.  I have updated the commit message to make this clearer.

[...]

> Signed-off-by: Giuliano Procida <gprocida@google.com>

Thanks.  Applied to master at
https://sourceware.org/git/?p=libabigail.git;a=commit;h=005ab5c9bd21e3d755fb3830cedd431189841fc2.

Cheers,
diff mbox series

Patch

diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 358a7a2..d98d4bd 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -19960,20 +19960,7 @@  class_decl::get_pretty_representation(bool internal,
   // if an anonymous class is named by a typedef, then consider that
   // it has a name, which is the typedef name.
   if (get_is_anonymous())
-    {
-      if (internal)
-	{
-	  if (typedef_decl_sptr d = get_naming_typedef())
-	    {
-	      string qualified_name =
-		decl_base::priv_->qualified_parent_name_ + "::" + d->get_name();
-	      return cl + qualified_name;
-	    }
-	}
-      else
-	return get_class_or_union_flat_representation(this, "",
-						      /*one_line=*/true);
-    }
+    return get_class_or_union_flat_representation(this, "",/*one_line=*/true);
 
   string result = cl;
   if (qualified_name)
@@ -21745,7 +21732,7 @@  union_decl::get_pretty_representation(bool internal,
 				      bool qualified_name) const
 {
   string repr;
-  if (get_is_anonymous() && !internal)
+  if (get_is_anonymous())
     repr = get_class_or_union_flat_representation(this, "",
 						  /*one_line=*/true);
   else
diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi
index 5001d02..2019be1 100644
--- a/tests/data/test-annotate/libtest23.so.abi
+++ b/tests/data/test-annotate/libtest23.so.abi
@@ -20,45 +20,45 @@ 
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
-    <!-- struct {} -->
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-3'/>
     <!-- struct typedef __va_list_tag __va_list_tag -->
-    <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-4'>
+    <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-3'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int typedef __va_list_tag __va_list_tag::gp_offset -->
-        <var-decl name='gp_offset' type-id='type-id-5' visibility='default'/>
+        <var-decl name='gp_offset' type-id='type-id-4' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- unsigned int typedef __va_list_tag __va_list_tag::fp_offset -->
-        <var-decl name='fp_offset' type-id='type-id-5' visibility='default'/>
+        <var-decl name='fp_offset' type-id='type-id-4' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void* typedef __va_list_tag __va_list_tag::overflow_arg_area -->
-        <var-decl name='overflow_arg_area' type-id='type-id-6' visibility='default'/>
+        <var-decl name='overflow_arg_area' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void* typedef __va_list_tag __va_list_tag::reg_save_area -->
-        <var-decl name='reg_save_area' type-id='type-id-6' visibility='default'/>
+        <var-decl name='reg_save_area' type-id='type-id-5' visibility='default'/>
       </data-member>
     </class-decl>
     <!-- double -->
-    <type-decl name='double' size-in-bits='64' id='type-id-7'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-6'/>
     <!-- float -->
-    <type-decl name='float' size-in-bits='32' id='type-id-8'/>
+    <type-decl name='float' size-in-bits='32' id='type-id-7'/>
     <!-- int -->
-    <type-decl name='int' size-in-bits='32' id='type-id-9'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-8'/>
     <!-- long double -->
-    <type-decl name='long double' size-in-bits='128' id='type-id-10'/>
+    <type-decl name='long double' size-in-bits='128' id='type-id-9'/>
     <!-- long int -->
-    <type-decl name='long int' size-in-bits='64' id='type-id-11'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-10'/>
     <!-- long long int -->
-    <type-decl name='long long int' size-in-bits='64' id='type-id-12'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-11'/>
     <!-- long long unsigned int -->
-    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-13'/>
+    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-12'/>
     <!-- short int -->
-    <type-decl name='short int' size-in-bits='16' id='type-id-14'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-13'/>
+    <!-- struct {} -->
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-14'/>
     <!-- unsigned int -->
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-5'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-4'/>
     <!-- unsigned long int -->
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-15'/>
     <!-- unsigned long int[] -->
@@ -71,7 +71,7 @@ 
     <!-- wchar_t -->
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-19'/>
     <!-- typedef unsigned int wint_t -->
-    <typedef-decl name='wint_t' type-id='type-id-5' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stddef.h' line='353' column='1' id='type-id-20'/>
+    <typedef-decl name='wint_t' type-id='type-id-4' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/stddef.h' line='353' column='1' id='type-id-20'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-21' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-22'/>
     <!-- typedef unsigned long int size_t -->
@@ -88,7 +88,7 @@ 
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int __count -->
-        <var-decl name='__count' type-id='type-id-9' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1'/>
+        <var-decl name='__count' type-id='type-id-8' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- union {} __value -->
@@ -99,43 +99,43 @@ 
     <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-28'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int tm::tm_sec -->
-        <var-decl name='tm_sec' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
+        <var-decl name='tm_sec' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int tm::tm_min -->
-        <var-decl name='tm_min' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='136' column='1'/>
+        <var-decl name='tm_min' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int tm::tm_hour -->
-        <var-decl name='tm_hour' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='137' column='1'/>
+        <var-decl name='tm_hour' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- int tm::tm_mday -->
-        <var-decl name='tm_mday' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='138' column='1'/>
+        <var-decl name='tm_mday' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='138' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int tm::tm_mon -->
-        <var-decl name='tm_mon' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='139' column='1'/>
+        <var-decl name='tm_mon' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int tm::tm_year -->
-        <var-decl name='tm_year' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='140' column='1'/>
+        <var-decl name='tm_year' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='140' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int tm::tm_wday -->
-        <var-decl name='tm_wday' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='141' column='1'/>
+        <var-decl name='tm_wday' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='141' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int tm::tm_yday -->
-        <var-decl name='tm_yday' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='142' column='1'/>
+        <var-decl name='tm_yday' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int tm::tm_isdst -->
-        <var-decl name='tm_isdst' type-id='type-id-9' visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
+        <var-decl name='tm_isdst' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- long int tm::tm_gmtoff -->
-        <var-decl name='tm_gmtoff' type-id='type-id-11' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
+        <var-decl name='tm_gmtoff' type-id='type-id-10' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- const char* tm::tm_zone -->
@@ -147,11 +147,11 @@ 
     <!-- typedef const __int32_t* wctrans_t -->
     <typedef-decl name='wctrans_t' type-id='type-id-31' filepath='/usr/include/wctype.h' line='186' column='1' id='type-id-32'/>
     <!-- typedef int __int32_t -->
-    <typedef-decl name='__int32_t' type-id='type-id-9' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-33'/>
+    <typedef-decl name='__int32_t' type-id='type-id-8' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-33'/>
     <!-- __FILE* -->
     <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-34'/>
     <!-- __anonymous_struct__1* -->
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-35'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-35'/>
     <!-- char& -->
     <reference-type-def kind='lvalue' type-id='type-id-2' size-in-bits='64' id='type-id-36'/>
     <!-- char* -->
@@ -175,15 +175,15 @@ 
     <!-- const char** -->
     <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-45'/>
     <!-- const int -->
-    <qualified-type-def type-id='type-id-9' const='yes' id='type-id-46'/>
+    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-46'/>
     <!-- const long int -->
-    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-47'/>
+    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-47'/>
     <!-- const mbstate_t -->
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-48'/>
     <!-- const mbstate_t* -->
     <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-49'/>
     <!-- const short int -->
-    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-50'/>
+    <qualified-type-def type-id='type-id-13' const='yes' id='type-id-50'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
     <qualified-type-def type-id='type-id-51' const='yes' id='type-id-52'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
@@ -221,9 +221,9 @@ 
     <!-- std::string& -->
     <reference-type-def kind='lvalue' type-id='type-id-72' size-in-bits='64' id='type-id-70'/>
     <!-- typedef __va_list_tag __va_list_tag* -->
-    <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-73