From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gprocida@google.com>
Received: from mail-il1-x130.google.com (mail-il1-x130.google.com
 [IPv6:2607:f8b0:4864:20::130])
 by sourceware.org (Postfix) with ESMTPS id A2AA13857C46
 for <libabigail@sourceware.org>; Fri, 18 Sep 2020 13:00:19 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A2AA13857C46
Received: by mail-il1-x130.google.com with SMTP id t18so6112346ilp.5
 for <libabigail@sourceware.org>; Fri, 18 Sep 2020 06:00:19 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:mime-version:references:in-reply-to:from:date
 :message-id:subject:to:cc;
 bh=eYguVJoJ/2Ns8QTyTVJP5D7/JgP+7s8aJLmZW46Cjwk=;
 b=a80vaXMLEOMU+sMHSAvQ0If6DIIKL9ush90xpvfI2ps/GHDoBh2CBi0/4TYJssBFm3
 zDXrXkp9B93TxmJwiFE/nqUqwutR3RRyo+5UDqBfFBJcSeulrbSL/ov9dqHCA3nHAt0p
 tYFImPlteIa7mSFJvZKrokc/AXoIRSUak78+NenARgL4F9MXukZy0O5op25bDCh3MoQq
 yn2DX5pczz1QRkRW51/sfyinVuI6DBEzCE1JP0UXPH0ouhbhVLatlTFfX65Xd/nY/VfI
 pLJUITQiqQbvVp5t7hOckHc9t4OiXzlExA+1PcDczvJ0/2go7D4e+3gY9CQDPHWdlrUU
 aUtA==
X-Gm-Message-State: AOAM533zTPXpsfkGonHu+/rWhmBzSE5tbNZuzjIPOXJlzBfGBMcJjooG
 Munuq+CazaDRdqpUCbkee9Gjh2/Vs4iVJaUPnKB4D7jNhkw=
X-Google-Smtp-Source: ABdhPJy8IzPBXV/gaMHbqqO2WWzFzWeLNoKM+HClOuhQ75JIIdycbiQwZjA0EmmYe0FM3ZugbMwl4JQ1i8bBvk2B/Pw=
X-Received: by 2002:a92:b699:: with SMTP id m25mr19608854ill.0.1600434015077; 
 Fri, 18 Sep 2020 06:00:15 -0700 (PDT)
MIME-Version: 1.0
References: <87pn6kr0dg.fsf@redhat.com>
In-Reply-To: <87pn6kr0dg.fsf@redhat.com>
From: Giuliano Procida <gprocida@google.com>
Date: Fri, 18 Sep 2020 13:59:27 +0100
Message-ID: <CAGvU0HkenD_1o=g6kQfvCo4U=a31tm23TWKn59FNeF_YFZteBg@mail.gmail.com>
Subject: Re: [PATCH] Bug 26568 - Union should support more than one anonymous
 member
To: Dodji Seketeli <dodji@redhat.com>
Cc: libabigail@sourceware.org
X-Spam-Status: No, score=-24.9 required=5.0 tests=BAYES_00, GIT_PATCH_0,
 LIKELY_SPAM_BODY, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS,
 TIME_LIMIT_EXCEEDED, USER_IN_DEF_DKIM_WL,
 USER_IN_DEF_SPF_WL autolearn=unavailable version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.29
X-BeenThere: libabigail@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Mailing list of the Libabigail project <libabigail.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/libabigail>,
 <mailto:libabigail-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/libabigail/>
List-Help: <mailto:libabigail-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/libabigail>,
 <mailto:libabigail-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Sep 2020 13:01:57 -0000

Hi Dodji.

Thanks for fixing.

Giuliano.

On Thu, 17 Sep 2020 at 14:37, Dodji Seketeli <dodji@redhat.com> wrote:

> Hello,
>
> When building a union type we try to ensure that each member is
> present only once.  This is because the code to build the union is
> also used to actually update a partially constructed union.  To do so,
> before adding a member to the union, the member is looked up (among
> the current members) by name to see if it's already present or not.
>
> But then for anonymous members, the name of the member is empty.
> After the first anonymous member is added to the union, subsequent
> look-ups with an empty name all succeed.  So no more than one
> anonymous member is added to the union.  Oops.
>
> A way to fix this is to perform the lookup by taking into account the
> type of the anonymous data member, not its (empty) name.  We already
> do this for anonymous data members of classes/structs.
>
> This patch thus uses that type-based anonymous data member lookup for
> unions.
>
> But then now that unions can have several anonymous members, another
> issue was uncovered.
>
> Array types whose elements are of anonymous type can be wrongly
> considered different because of canonicalization issues.
>
> Let's suppose we have these two arrays whose internal pretty
> representation are:
>
>     "__anonymous_struct_1__ foo[5]"
>
> and
>
>    "__anonymous_struct_2__ foo[5]"
>
> These are arrays of 5 elements of type anonymous struct.  Suppose the
> anonymous structs "__anonymous_struct_1__" and
> "__anonymous_struct_2__" are structurally equivalent.  Because the
> internal names of these array element types are different, the
> internal pretty representations of the arrays are different.  And thus
> the canonical types of the two arrays are different.  And that's
> wrong.  In this particular case, they should have the same canonical
> type and thus be considered equivalent.
>
> This patch thus teaches 'get_type_name' to make the internal type
> name of anonymous types of a given kind be the same.  Thus, making all
> arrays of 5 anonymous struct have the same pretty representation:
>
>     "__anonymous_struct__ foo[5]"
>
> This gives the type canonicalizer a chance to detect that those arrays
> having the same canonical type.
>
> These two changes while being seemingly unrelated need to be bundled
> together to fix a number of issues in the existing test reference
> outputs because fixing the first one is needed to uncover the later
> issue.
>
>         * src/abg-dwarf-reader.cc (add_or_update_union_type): Don't use
>         the empty name of anonymous members in the lookup to ensure that
>         all data members are unique.  Rather, use the whole anonymous
>         member itself for the lookup, just like is done to handle
>         anonymous data member in classes/structs.
>         * src/abg-reader.cc (build_union_decl): Likewise.
>         * src/abg-ir.cc (get_generic_anonymous_internal_type_name): Define
>         new static function.
>         (get_type_name): For internal purposes, make the type name of all
>         anonymous types of a given kind to be the same.  This allows the
>         internal representation of anonymous types which are based on type
>         names to all be the same, so that they can be compared among
>         themselves during type canonicalization.
>         * tests/data/test-read-dwarf/test-PR26568-{1,2}.c: Source code of
>         binary test input.
>         * tests/data/test-read-dwarf/test-PR26568-{1,2}.o: New binary test
> input.
>         * tests/data/test-read-dwarf/test-PR26568-{1,2}.o.abi: New
>         reference test ouput.
>         * tests/data/Makefile.am: Add the new test material above to
>         source distribution.
>         * tests/test-read-dwarf.cc (in_out_specs): Add the new binary test
>         input above to this test harness.
>         *
> tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi:
> Adjust.
>         * tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise.
>         * tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
>
>
Reviewed-by: Giuliano Procida <gprocida@google.com>


> Signed-off-by: Dodji Seketeli <dodji@redhat.com>
> ---
>  src/abg-dwarf-reader.cc                            |   12 +-
>  src/abg-ir.cc                                      |   40 +
>  src/abg-reader.cc                                  |    2 +-
>  tests/data/Makefile.am                             |   20 +-
>  .../PR25409-librte_bus_dpaa.so.20.0.abi            | 1887 +++++-----
>  tests/data/test-read-dwarf/PR22122-libftdc.so.abi  | 3979
> ++++++++++----------
>  tests/data/test-read-dwarf/PR25007-sdhci.ko.abi    | 1734 ++++-----
>  tests/data/test-read-dwarf/test-PR26568-1.c        |   15 +
>  tests/data/test-read-dwarf/test-PR26568-1.o        |  Bin 0 -> 2864 bytes
>  tests/data/test-read-dwarf/test-PR26568-1.o.abi    |   38 +
>  tests/data/test-read-dwarf/test-PR26568-2.c        |   13 +
>  tests/data/test-read-dwarf/test-PR26568-2.o        |  Bin 0 -> 2824 bytes
>  tests/data/test-read-dwarf/test-PR26568-2.o.abi    |   33 +
>  tests/test-read-dwarf.cc                           |   14 +
>  14 files changed, 3946 insertions(+), 3841 deletions(-)
>  create mode 100644 tests/data/test-read-dwarf/test-PR26568-1.c
>  create mode 100644 tests/data/test-read-dwarf/test-PR26568-1.o
>  create mode 100644 tests/data/test-read-dwarf/test-PR26568-1.o.abi
>  create mode 100644 tests/data/test-read-dwarf/test-PR26568-2.c
>  create mode 100644 tests/data/test-read-dwarf/test-PR26568-2.o
>  create mode 100644 tests/data/test-read-dwarf/test-PR26568-2.o.abi
>
> diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
> index 7c56bd8..7257052 100644
> --- a/src/abg-dwarf-reader.cc
> +++ b/src/abg-dwarf-reader.cc
> @@ -14088,7 +14088,11 @@ add_or_update_union_type(read_context&  ctxt,
>               location loc;
>               die_loc_and_name(ctxt, &child, loc, n, m);
>
> -             if (lookup_var_decl_in_scope(n, result))
> +             // Because we can be updating an existing union, let's
> +             // make sure we don't already have a member of the same
> +             // name.  Anonymous member are handled a bit later below
> +             // so let's not consider them here.
> +             if (!n.empty() && lookup_var_decl_in_scope(n, result))
>                 continue;
>
>               ssize_t offset_in_bits = 0;
> @@ -14109,6 +14113,12 @@ add_or_update_union_type(read_context&  ctxt,
>               die_access_specifier(&child, access);
>
>               var_decl_sptr dm(new var_decl(n, t, loc, m));
> +             // If dm is an anonymous data member, let's make sure
> +             // the current union doesn't already have it as a data
> +             // member.
> +             if (n.empty() && result->find_data_member(dm))
> +               continue;
> +
>               result->add_data_member(dm, access, /*is_laid_out=*/true,
>                                       /*is_static=*/false,
>                                       offset_in_bits);
> diff --git a/src/abg-ir.cc b/src/abg-ir.cc
> index dbb4364..2852c09 100644
> --- a/src/abg-ir.cc
> +++ b/src/abg-ir.cc
> @@ -6818,6 +6818,39 @@ interned_string
>  get_type_name(const type_base_sptr& t, bool qualified, bool internal)
>  {return get_type_name(t.get(), qualified, internal);}
>
> +/// Return the generic internal name of an anonymous type.
> +///
> +/// For internal purposes, we want to define a generic name for all
> +/// anonymous types of a certain kind.  For instance, all anonymous
> +/// structs will be have a generic name of "__anonymous_struct__", all
> +/// anonymous unions will have a generic name of
> +/// "__anonymous_union__", etc.
> +///
> +/// That generic name can be used as a hash to put all anonymous types
> +/// of a certain kind in the same hash table bucket, for instance.
> +static interned_string
> +get_generic_anonymous_internal_type_name(const decl_base *d)
> +{
> +  ABG_ASSERT(d);
> +
> +  const environment *env = d->get_environment();
> +
> +  interned_string result;
> +  if (is_class_type(d))
> +    result =
> +
> env->intern(tools_utils::get_anonymous_struct_internal_name_prefix());
> +  else if (is_union_type(d))
> +    result =
> +
> env->intern(tools_utils::get_anonymous_union_internal_name_prefix());
> +  else if (is_enum_type(d))
> +    result =
> +      env->intern(tools_utils::get_anonymous_enum_internal_name_prefix());
> +  else
> +    ABG_ASSERT_NOT_REACHED;
> +
> +  return result;
> +}
> +
>  /// Get the name of a given type and return a copy of it.
>  ///
>  /// @param t the type to consider.
> @@ -6842,6 +6875,13 @@ get_type_name(const type_base* t, bool qualified,
> bool internal)
>        ABG_ASSERT(fn_type);
>        return fn_type->get_cached_name(internal);
>      }
> +
> +  // All anonymous types of a given kind get to have the same internal
> +  // name for internal purpose.  This to allow them to be compared
> +  // among themselves during type canonicalization.
> +  if (internal && d->get_is_anonymous())
> +    return get_generic_anonymous_internal_type_name(d);
> +
>    if (qualified)
>      return d->get_qualified_name(internal);
>    return d->get_name();
> diff --git a/src/abg-reader.cc b/src/abg-reader.cc
> index e72a5de..3157473 100644
> --- a/src/abg-reader.cc
> +++ b/src/abg-reader.cc
> @@ -4939,7 +4939,7 @@ build_union_decl(read_context& ctxt,
>               if (var_decl_sptr v =
>                   build_var_decl(ctxt, p, /*add_to_cur_scope=*/false))
>                 {
> -                 if (decl->find_data_member(v->get_name()))
> +                 if (decl->find_data_member(v))
>                     {
>                       // We are in updating mode and the current
>                       // version of this class already has this data
> diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
> index 7334db2..cb82ff6 100644
> --- a/tests/data/Makefile.am
> +++ b/tests/data/Makefile.am
> @@ -504,6 +504,12 @@ test-read-dwarf/PR26261/PR26261-exe \
>  test-read-dwarf/PR26261/PR26261-main.c \
>  test-read-dwarf/PR26261/PR26261-obja.h \
>  test-read-dwarf/PR26261/PR26261-objb.h \
> +test-read-dwarf/test-PR26568-1.c     \
> +test-read-dwarf/test-PR26568-2.c     \
> +test-read-dwarf/test-PR26568-2.o     \
> +test-read-dwarf/test-PR26568-1.o     \
> +test-read-dwarf/test-PR26568-1.o.abi \
> +test-read-dwarf/test-PR26568-2.o.abi \
>  \
>  test-annotate/test0.abi                        \
>  test-annotate/test1.abi                        \
> @@ -513,20 +519,20 @@ test-annotate/test4.so.abi                \
>  test-annotate/test5.o.abi              \
>  test-annotate/test6.so.abi             \
>  test-annotate/test7.so.abi             \
> -test-annotate/test8-qualified-this-pointer.so.abi              \
> +test-annotate/test8-qualified-this-pointer.so.abi \
>  test-annotate/test13-pr18894.so.abi \
>  test-annotate/test14-pr18893.so.abi \
>  test-annotate/test15-pr18892.so.abi \
>  test-annotate/test17-pr19027.so.abi \
> -test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi \
> +test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi   \
>  test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi \
> -test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi \
> +test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi   \
>  test-annotate/test21-pr19092.so.abi \
>  test-annotate/libtest23.so.abi \
> -test-annotate/libtest24-drop-fns-2.so.abi \
> -test-annotate/libtest24-drop-fns.so.abi \
> -test-annotate/test-anonymous-members-0.cc \
> -test-annotate/test-anonymous-members-0.o \
> +test-annotate/libtest24-drop-fns-2.so.abi    \
> +test-annotate/libtest24-drop-fns.so.abi      \
> +test-annotate/test-anonymous-members-0.cc    \
> +test-annotate/test-anonymous-members-0.o     \
>  test-annotate/test-anonymous-members-0.o.abi \
>  \
>  test-types-stability/pr19434-elf0 \
> diff --git
> a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
> b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
> index b613b04..45984d7 100644
> --- a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
> +++ b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
> @@ -1,4 +1,4 @@
> -<abi-corpus path='PR25409-librte_bus_dpaa.so.20.0'
> architecture='elf-amd-x86_64' soname='librte_bus_dpaa.so.20.0'>
> +<abi-corpus
> path='tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0'
> soname='librte_bus_dpaa.so.20.0'>
>    <elf-needed>
>      <dependency name='libm.so.6'/>
>      <dependency name='libdl.so.2'/>
> @@ -562,24 +562,17 @@
>        </data-member>
>      </class-decl>
>      <union-decl name='__anonymous_union__1' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='43'
> column='1' id='type-id-77'>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='57'
> column='1' id='type-id-78'>
> -          <data-member access='public' layout-offset-in-bits='16'>
> -            <var-decl name='addr' type-id='type-id-79'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='62'
> column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='__notaddress' type-id='type-id-79'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='63'
> column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-80' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44'
> column='1'/>
> +        <var-decl name='' type-id='type-id-78' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='opaque' type-id='type-id-79' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='66'
> column='1'/>
> +        <var-decl name='' type-id='type-id-79' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='57'
> column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='opaque' type-id='type-id-80' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='66'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__1' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44'
> column='1' id='type-id-80'>
> +    <class-decl name='__anonymous_struct__1' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44'
> column='1' id='type-id-78'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='lo' type-id='type-id-8' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='51'
> column='1'/>
>        </data-member>
> @@ -593,7 +586,15 @@
>          <var-decl name='__reserved' type-id='type-id-51'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='54'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='u64' type-id='type-id-11'
> filepath='../../dpdk/drivers/common/dpaax/compat.h' line='107' column='1'
> id='type-id-79'/>
> +    <class-decl name='__anonymous_struct__2' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='57'
> column='1' id='type-id-79'>
> +      <data-member access='public' layout-offset-in-bits='16'>
> +        <var-decl name='addr' type-id='type-id-80' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='62'
> column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='__notaddress' type-id='type-id-80'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='63'
> column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <typedef-decl name='u64' type-id='type-id-11'
> filepath='../../dpdk/drivers/common/dpaax/compat.h' line='107' column='1'
> id='type-id-80'/>
>      <class-decl name='bm_mc' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='110'
> column='1' id='type-id-71'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='cr' type-id='type-id-81' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman.h' line='111'
> column='1'/>
> @@ -653,7 +654,7 @@
>          <var-decl name='query' type-id='type-id-91' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='151'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__2' size-in-bits='512'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='139'
> column='1' id='type-id-89'>
> +    <class-decl name='__anonymous_struct__3' size-in-bits='512'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='139'
> column='1' id='type-id-89'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='verb' type-id='type-id-51' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='140'
> column='1'/>
>        </data-member>
> @@ -669,7 +670,7 @@
>          <var-decl name='bufs' type-id='type-id-43' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='149'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__3' size-in-bits='512'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='144'
> column='1' id='type-id-92'>
> +    <class-decl name='__anonymous_struct__4' size-in-bits='512'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='144'
> column='1' id='type-id-92'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='__reserved1' type-id='type-id-51'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='145'
> column='1'/>
>        </data-member>
> @@ -691,7 +692,7 @@
>          <var-decl name='ds' type-id='type-id-93' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='134'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__4' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='130'
> column='1' id='type-id-93'>
> +    <class-decl name='__anonymous_struct__5' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='130'
> column='1' id='type-id-93'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='__reserved1' type-id='type-id-58'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='131'
> column='1'/>
>        </data-member>
> @@ -1009,24 +1010,17 @@
>        </data-member>
>      </class-decl>
>      <union-decl name='__anonymous_union__' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='121'
> column='1' id='type-id-159'>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='141'
> column='1' id='type-id-162'>
> -          <data-member access='public' layout-offset-in-bits='40'>
> -            <var-decl name='__notaddress' type-id='type-id-79'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='142'
> column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='addr' type-id='type-id-79'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='144'
> column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-163' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122'
> column='1'/>
> +        <var-decl name='' type-id='type-id-162' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122'
> column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-163' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='141'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='opaque_addr' type-id='type-id-79'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='146'
> column='1'/>
> +        <var-decl name='opaque_addr' type-id='type-id-80'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='146'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122'
> column='1' id='type-id-163'>
> +    <class-decl name='__anonymous_struct__' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122'
> column='1' id='type-id-162'>
>        <data-member access='public' layout-offset-in-bits='2'>
>          <var-decl name='liodn_offset' type-id='type-id-51'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='132'
> column='1'/>
>        </data-member>
> @@ -1049,35 +1043,29 @@
>          <var-decl name='addr_lo' type-id='type-id-8' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='138'
> column='1'/>
>        </data-member>
>      </class-decl>
> +    <class-decl name='__anonymous_struct__1' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='141'
> column='1' id='type-id-163'>
> +      <data-member access='public' layout-offset-in-bits='40'>
> +        <var-decl name='__notaddress' type-id='type-id-80'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='142'
> column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='addr' type-id='type-id-80' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='144'
> column='1'/>
> +      </data-member>
> +    </class-decl>
>      <union-decl name='__anonymous_union__1' size-in-bits='32'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='154'
> column='1' id='type-id-160'>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='172'
> column='1' id='type-id-164'>
> -          <data-member access='public' layout-offset-in-bits='3'>
> -            <var-decl name='length29' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='177'
> column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='_format1' type-id='type-id-165'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='178'
> column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__1' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='182'
> column='1' id='type-id-166'>
> -          <data-member access='public' layout-offset-in-bits='3'>
> -            <var-decl name='cong_weight' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='187'
> column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='_format2' type-id='type-id-165'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='188'
> column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
>        <data-member access='private'>
>          <var-decl name='opaque' type-id='type-id-8' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='158'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-167' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160'
> column='1'/>
> +        <var-decl name='' type-id='type-id-164' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160'
> column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-165' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='172'
> column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-166' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='182'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__1' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160'
> column='1' id='type-id-167'>
> +    <class-decl name='__anonymous_struct__2' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160'
> column='1' id='type-id-164'>
>        <data-member access='public' layout-offset-in-bits='12'>
>          <var-decl name='length20' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='166'
> column='1'/>
>        </data-member>
> @@ -1085,10 +1073,10 @@
>          <var-decl name='offset' type-id='type-id-5' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='167'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='format' type-id='type-id-165'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='168'
> column='1'/>
> +        <var-decl name='format' type-id='type-id-167'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='168'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='qm_fd_format'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='95'
> column='1' id='type-id-165'>
> +    <enum-decl name='qm_fd_format'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='95'
> column='1' id='type-id-167'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='qm_fd_contig' value='0'/>
>        <enumerator name='qm_fd_contig_big' value='2'/>
> @@ -1096,6 +1084,22 @@
>        <enumerator name='qm_fd_sg_big' value='6'/>
>        <enumerator name='qm_fd_compound' value='1'/>
>      </enum-decl>
> +    <class-decl name='__anonymous_struct__3' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='172'
> column='1' id='type-id-165'>
> +      <data-member access='public' layout-offset-in-bits='3'>
> +        <var-decl name='length29' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='177'
> column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='_format1' type-id='type-id-167'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='178'
> column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <class-decl name='__anonymous_struct__4' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='182'
> column='1' id='type-id-166'>
> +      <data-member access='public' layout-offset-in-bits='3'>
> +        <var-decl name='cong_weight' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='187'
> column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='_format2' type-id='type-id-167'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='188'
> column='1'/>
> +      </data-member>
> +    </class-decl>
>      <union-decl name='__anonymous_union__2' size-in-bits='32'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='192'
> column='1' id='type-id-161'>
>        <data-member access='private'>
>          <var-decl name='cmd' type-id='type-id-8' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='193'
> column='1'/>
> @@ -1198,7 +1202,7 @@
>          <var-decl name='fq' type-id='type-id-174' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='363'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__2' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='328'
> column='1' id='type-id-172'>
> +    <class-decl name='__anonymous_struct__5' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='328'
> column='1' id='type-id-172'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='verb' type-id='type-id-51' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='329'
> column='1'/>
>        </data-member>
> @@ -1224,7 +1228,7 @@
>          <var-decl name='fd' type-id='type-id-158' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='336'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__3' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='338'
> column='1' id='type-id-173'>
> +    <class-decl name='__anonymous_struct__6' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='338'
> column='1' id='type-id-173'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='verb' type-id='type-id-51' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='339'
> column='1'/>
>        </data-member>
> @@ -1263,7 +1267,7 @@
>        <enumerator name='qm_dc_portal_caam' value='2'/>
>        <enumerator name='qm_dc_portal_pme' value='3'/>
>      </enum-decl>
> -    <class-decl name='__anonymous_struct__4' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='356'
> column='1' id='type-id-174'>
> +    <class-decl name='__anonymous_struct__7' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='356'
> column='1' id='type-id-174'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='verb' type-id='type-id-51' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='357'
> column='1'/>
>        </data-member>
> @@ -1394,7 +1398,7 @@
>          <var-decl name='' type-id='type-id-195' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='444'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__5' size-in-bits='8'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='444'
> column='1' id='type-id-195'>
> +    <class-decl name='__anonymous_struct__8' size-in-bits='8'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='444'
> column='1' id='type-id-195'>
>        <data-member access='public' layout-offset-in-bits='6'>
>          <var-decl name='olws' type-id='type-id-51' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='451'
> column='1'/>
>        </data-member>
> @@ -1416,7 +1420,7 @@
>          <var-decl name='dest' type-id='type-id-196' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='470'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__6' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='462'
> column='1' id='type-id-196'>
> +    <class-decl name='__anonymous_struct__9' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='462'
> column='1' id='type-id-196'>
>        <data-member access='public' layout-offset-in-bits='13'>
>          <var-decl name='wq' type-id='type-id-5' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='467'
> column='1'/>
>        </data-member>
> @@ -1458,27 +1462,17 @@
>        </data-member>
>      </class-decl>
>      <union-decl name='__anonymous_union__8' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='491'
> column='1' id='type-id-193'>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='505'
> column='1' id='type-id-198'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='context_lo' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='515'
> column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='32'>
> -            <var-decl name='context_hi' type-id='type-id-5'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='516'
> column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='48'>
> -            <var-decl name='stashing' type-id='type-id-199'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='517'
> column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
>        <data-member access='private'>
> -        <var-decl name='opaque' type-id='type-id-79' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='493'
> column='1'/>
> +        <var-decl name='opaque' type-id='type-id-80' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='493'
> column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-198' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-200' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494'
> column='1'/>
> +        <var-decl name='' type-id='type-id-199' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='505'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__7' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494'
> column='1' id='type-id-200'>
> +    <class-decl name='__anonymous_struct__10' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494'
> column='1' id='type-id-198'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='lo' type-id='type-id-8' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='499'
> column='1'/>
>        </data-member>
> @@ -1486,7 +1480,18 @@
>          <var-decl name='hi' type-id='type-id-8' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='500'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='qm_fqd_stashing' size-in-bits='16' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='401'
> column='1' id='type-id-199'>
> +    <class-decl name='__anonymous_struct__11' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='505'
> column='1' id='type-id-199'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='context_lo' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='515'
> column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='32'>
> +        <var-decl name='context_hi' type-id='type-id-5'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='516'
> column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='48'>
> +        <var-decl name='stashing' type-id='type-id-200'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='517'
> column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <class-decl name='qm_fqd_stashing' size-in-bits='16' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='401'
> column='1' id='type-id-200'>
>        <data-member access='public' layout-offset-in-bits='6'>
>          <var-decl name='context_cl' type-id='type-id-51'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='411'
> column='1'/>
>        </data-member>
> @@ -1619,7 +1624,7 @@
>          <var-decl name='' type-id='type-id-206' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='617'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__8' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='617'
> column='1' id='type-id-206'>
> +    <class-decl name='__anonymous_struct__12' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='617'
> column='1' id='type-id-206'>
>        <data-member access='public' layout-offset-in-bits='26'>
>          <var-decl name='Pn' type-id='type-id-8' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='625'
> column='1'/>
>        </data-member>
> @@ -1644,7 +1649,7 @@
>          <var-decl name='cscn_targ' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='680'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__9' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='671'
> column='1' id='type-id-207'>
> +    <class-decl name='__anonymous_struct__13' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='671'
> column='1' id='type-id-207'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='cscn_targ_dcp_low' type-id='type-id-5'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='676'
> column='1'/>
>        </data-member>
> @@ -1673,7 +1678,7 @@
>          <var-decl name='' type-id='type-id-210' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='644'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__10' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='644'
> column='1' id='type-id-210'>
> +    <class-decl name='__anonymous_struct__14' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='644'
> column='1' id='type-id-210'>
>        <data-member access='public' layout-offset-in-bits='11'>
>          <var-decl name='Tn' type-id='type-id-5' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='650'
> column='1'/>
>        </data-member>
> @@ -1739,7 +1744,7 @@
>          <var-decl name='channel' type-id='type-id-212'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='793'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__11' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='785'
> column='1' id='type-id-212'>
> +    <class-decl name='__anonymous_struct__15' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='785'
> column='1' id='type-id-212'>
>        <data-member access='public' layout-offset-in-bits='13'>
>          <var-decl name='__reserved1' type-id='type-id-5'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='790'
> column='1'/>
>        </data-member>
> @@ -1989,10 +1994,10 @@
>          <var-decl name='' type-id='type-id-227' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='955'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='i_bcnt' type-id='type-id-79' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='966'
> column='1'/>
> +        <var-decl name='i_bcnt' type-id='type-id-80' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='966'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__12' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='955'
> column='1' id='type-id-227'>
> +    <class-decl name='__anonymous_struct__16' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='955'
> column='1' id='type-id-227'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='i_bcnt_lo' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='961'
> column='1'/>
>        </data-member>
> @@ -2008,10 +2013,10 @@
>          <var-decl name='' type-id='type-id-228' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='969'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='a_bcnt' type-id='type-id-79' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='980'
> column='1'/>
> +        <var-decl name='a_bcnt' type-id='type-id-80' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='980'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__13' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='969'
> column='1' id='type-id-228'>
> +    <class-decl name='__anonymous_struct__17' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='969'
> column='1' id='type-id-228'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='a_bcnt_lo' type-id='type-id-8'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='975'
> column='1'/>
>        </data-member>
> @@ -2062,7 +2067,7 @@
>          <var-decl name='channel' type-id='type-id-231'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1008'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__14' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1000'
> column='1' id='type-id-231'>
> +    <class-decl name='__anonymous_struct__18' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1000'
> column='1' id='type-id-231'>
>        <data-member access='public' layout-offset-in-bits='13'>
>          <var-decl name='__reserved' type-id='type-id-5'
> visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1005'
> column='1'/>
>        </data-member>
> @@ -2180,7 +2185,7 @@
>          <var-decl name='' type-id='type-id-255' visibility='default'
> filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1011'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__15' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1011'
> column='1' id='type-id-255'>
> +    <class-decl name='__anonymous_struct__19' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1011'
> column='1' id='type-id-255'>
>        <data-member access='public' layout-offset-in-bits='12'>
>          <var-decl name='flow_id' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1012'
> column='1'/>
>        </data-member>
> @@ -2326,7 +2331,7 @@
>        </data-member>
>      </union-decl>
>      <typedef-decl name='rte_atomic16_t' type-id='type-id-270'
> filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h'
> line='225' column='1' id='type-id-269'/>
> -    <class-decl name='__anonymous_struct__16' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-269'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h'
> line='223' column='1' id='type-id-270'>
> +    <class-decl name='__anonymous_struct__20' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-269'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h'
> line='223' column='1' id='type-id-270'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='cnt' type-id='type-id-271' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_atomic.h'
> line='224' column='1'/>
>        </data-member>
> @@ -2341,7 +2346,7 @@
>          <var-decl name='' type-id='type-id-274' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='537'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__17' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='537' column='1'
> id='type-id-274'>
> +    <class-decl name='__anonymous_struct__21' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='537' column='1'
> id='type-id-274'>
>        <data-member access='public' layout-offset-in-bits='28'>
>          <var-decl name='l2_type' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='538'
> column='1'/>
>        </data-member>
> @@ -2369,7 +2374,7 @@
>          <var-decl name='' type-id='type-id-276' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='550'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__18' size-in-bits='8'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='550' column='1'
> id='type-id-276'>
> +    <class-decl name='__anonymous_struct__22' size-in-bits='8'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='550' column='1'
> id='type-id-276'>
>        <data-member access='public' layout-offset-in-bits='4'>
>          <var-decl name='inner_l2_type' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h'
> line='551' column='1'/>
>        </data-member>
> @@ -2399,7 +2404,7 @@
>          <var-decl name='usr' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='596'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__19' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='570' column='1'
> id='type-id-278'>
> +    <class-decl name='__anonymous_struct__23' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='570' column='1'
> id='type-id-278'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='' type-id='type-id-281' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='571'
> column='1'/>
>        </data-member>
> @@ -2415,7 +2420,7 @@
>          <var-decl name='lo' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='576'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__20' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='572' column='1'
> id='type-id-282'>
> +    <class-decl name='__anonymous_struct__24' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='572' column='1'
> id='type-id-282'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='hash' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='573'
> column='1'/>
>        </data-member>
> @@ -2437,7 +2442,7 @@
>          <var-decl name='reserved' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h'
> line='430' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__21' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='586' column='1'
> id='type-id-280'>
> +    <class-decl name='__anonymous_struct__25' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='586' column='1'
> id='type-id-280'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='reserved1' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h'
> line='587' column='1'/>
>        </data-member>
> @@ -2595,7 +2600,7 @@
>          <var-decl name='' type-id='type-id-300' visibility='default'
> filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='140'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__22' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='137'
> column='1' id='type-id-299'>
> +    <class-decl name='__anonymous_struct__26' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='137'
> column='1' id='type-id-299'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='stqe_next' type-id='type-id-296'
> visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h'
> line='137' column='1'/>
>        </data-member>
> @@ -2639,7 +2644,7 @@
>          <var-decl name='opaque' type-id='type-id-59' visibility='default'
> filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='196'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__23' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='186'
> column='1' id='type-id-304'>
> +    <class-decl name='__anonymous_struct__27' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='186'
> column='1' id='type-id-304'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='stqe_next' type-id='type-id-301'
> visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h'
> line='186' column='1'/>
>        </data-member>
> @@ -2661,7 +2666,7 @@
>          <var-decl name='' type-id='type-id-309' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='629'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__24' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='629' column='1'
> id='type-id-309'>
> +    <class-decl name='__anonymous_struct__28' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='629' column='1'
> id='type-id-309'>
>        <data-member access='public' layout-offset-in-bits='57'>
>          <var-decl name='l2_len' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='630'
> column='1'/>
>        </data-member>
> @@ -2701,7 +2706,7 @@
>        <enumerator name='qman_fq_state_retired' value='3'/>
>      </enum-decl>
>      <typedef-decl name='rte_spinlock_t' type-id='type-id-313'
> filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h'
> line='32' column='1' id='type-id-150'/>
> -    <class-decl name='__anonymous_struct__25' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-150'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h'
> line='30' column='1' id='type-id-313'>
> +    <class-decl name='__anonymous_struct__29' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-150'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h'
> line='30' column='1' id='type-id-313'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='locked' type-id='type-id-314'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/generic/rte_spinlock.h'
> line='31' column='1'/>
>        </data-member>
> @@ -3059,78 +3064,78 @@
>      <array-type-def dimensions='1' type-id='type-id-351'
> size-in-bits='8192' id='type-id-352'>
>        <subrange length='64' type-id='type-id-10' id='type-id-350'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-353'
> size-in-bits='8192' id='type-id-354'>
> +    <array-type-def dimensions='1' type-id='type-id-351'
> size-in-bits='8192' id='type-id-353'>
>        <subrange length='64' type-id='type-id-10' id='type-id-350'/>
>      </array-type-def>
> -    <array-type-def dimensions='2' type-id='type-id-355'
> size-in-bits='8192' id='type-id-356'>
> +    <array-type-def dimensions='2' type-id='type-id-348'
> size-in-bits='8192' id='type-id-354'>
>        <subrange length='64' type-id='type-id-10' id='type-id-350'/>
>        <subrange length='8' type-id='type-id-10' id='type-id-44'/>
>      </array-type-def>
> -    <type-decl name='bool' size-in-bits='8' id='type-id-357'/>
> -    <array-type-def dimensions='1' type-id='type-id-45'
> size-in-bits='8192' id='type-id-358'>
> -      <subrange length='1024' type-id='type-id-10' id='type-id-359'/>
> +    <type-decl name='bool' size-in-bits='8' id='type-id-355'/>
> +    <array-type-def dimensions='1' type-id='type-id-45'
> size-in-bits='8192' id='type-id-356'>
> +      <subrange length='1024' type-id='type-id-10' id='type-id-357'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-45'
> size-in-bits='512' id='type-id-360'>
> +    <array-type-def dimensions='1' type-id='type-id-45'
> size-in-bits='512' id='type-id-358'>
>        <subrange length='64' type-id='type-id-10' id='type-id-350'/>
>      </array-type-def>
> -    <class-decl name='rte_class' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-361'/>
> -    <class-decl name='rte_cryptodev' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-362'/>
> -    <class-decl name='rte_eth_dev_callback' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-363'/>
> -    <array-type-def dimensions='1' type-id='type-id-1'
> size-in-bits='16384' id='type-id-364'>
> -      <subrange length='512' type-id='type-id-10' id='type-id-365'/>
> +    <class-decl name='rte_class' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-359'/>
> +    <class-decl name='rte_cryptodev' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-360'/>
> +    <class-decl name='rte_eth_dev_callback' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-361'/>
> +    <array-type-def dimensions='1' type-id='type-id-1'
> size-in-bits='16384' id='type-id-362'>
> +      <subrange length='512' type-id='type-id-10' id='type-id-363'/>
>      </array-type-def>
> -    <type-decl name='long int' size-in-bits='64' id='type-id-366'/>
> -    <array-type-def dimensions='1' type-id='type-id-367'
> size-in-bits='196608' id='type-id-368'>
> -      <subrange length='512' type-id='type-id-10' id='type-id-365'/>
> +    <type-decl name='long int' size-in-bits='64' id='type-id-364'/>
> +    <array-type-def dimensions='1' type-id='type-id-365'
> size-in-bits='196608' id='type-id-366'>
> +      <subrange length='512' type-id='type-id-10' id='type-id-363'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-369'
> size-in-bits='3456' id='type-id-370'>
> -      <subrange length='24' type-id='type-id-10' id='type-id-371'/>
> +    <array-type-def dimensions='1' type-id='type-id-367'
> size-in-bits='3456' id='type-id-368'>
> +      <subrange length='24' type-id='type-id-10' id='type-id-369'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-372'
> size-in-bits='2304' id='type-id-373'>
> +    <array-type-def dimensions='1' type-id='type-id-370'
> size-in-bits='2304' id='type-id-371'>
>        <subrange length='8' type-id='type-id-10' id='type-id-44'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-374'
> size-in-bits='1024' id='type-id-375'>
> +    <array-type-def dimensions='1' type-id='type-id-372'
> size-in-bits='1024' id='type-id-373'>
>        <subrange length='32' type-id='type-id-10' id='type-id-53'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-376'
> size-in-bits='65536' id='type-id-377'>
> -      <subrange length='1024' type-id='type-id-10' id='type-id-359'/>
> +    <array-type-def dimensions='1' type-id='type-id-374'
> size-in-bits='65536' id='type-id-375'>
> +      <subrange length='1024' type-id='type-id-10' id='type-id-357'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='256'
> id='type-id-378'>
> +    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='256'
> id='type-id-376'>
>        <subrange length='16' type-id='type-id-10' id='type-id-13'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-4'
> size-in-bits='1024' id='type-id-379'>
> +    <array-type-def dimensions='1' type-id='type-id-4'
> size-in-bits='1024' id='type-id-377'>
>        <subrange length='64' type-id='type-id-10' id='type-id-350'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-7' size-in-bits='128'
> id='type-id-380'>
> +    <array-type-def dimensions='1' type-id='type-id-7' size-in-bits='128'
> id='type-id-378'>
>        <subrange length='4' type-id='type-id-10' id='type-id-50'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-11'
> size-in-bits='8192' id='type-id-381'>
> -      <subrange length='128' type-id='type-id-10' id='type-id-382'/>
> +    <array-type-def dimensions='1' type-id='type-id-11'
> size-in-bits='8192' id='type-id-379'>
> +      <subrange length='128' type-id='type-id-10' id='type-id-380'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-11'
> size-in-bits='256' id='type-id-383'>
> +    <array-type-def dimensions='1' type-id='type-id-11'
> size-in-bits='256' id='type-id-381'>
>        <subrange length='4' type-id='type-id-10' id='type-id-50'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-11'
> size-in-bits='4096' id='type-id-384'>
> +    <array-type-def dimensions='1' type-id='type-id-11'
> size-in-bits='4096' id='type-id-382'>
>        <subrange length='64' type-id='type-id-10' id='type-id-350'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-14'
> size-in-bits='8192' id='type-id-385'>
> -      <subrange length='1024' type-id='type-id-10' id='type-id-359'/>
> +    <array-type-def dimensions='1' type-id='type-id-14'
> size-in-bits='8192' id='type-id-383'>
> +      <subrange length='1024' type-id='type-id-10' id='type-id-357'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-14'
> size-in-bits='128' id='type-id-386'>
> +    <array-type-def dimensions='1' type-id='type-id-14'
> size-in-bits='128' id='type-id-384'>
>        <subrange length='16' type-id='type-id-10' id='type-id-13'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='64'
> id='type-id-387'>
> +    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='64'
> id='type-id-385'>
>        <subrange length='8' type-id='type-id-10' id='type-id-44'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-59'
> size-in-bits='1024' id='type-id-388'>
> +    <array-type-def dimensions='1' type-id='type-id-59'
> size-in-bits='1024' id='type-id-386'>
>        <subrange length='16' type-id='type-id-10' id='type-id-13'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-59'
> size-in-bits='256' id='type-id-389'>
> +    <array-type-def dimensions='1' type-id='type-id-59'
> size-in-bits='256' id='type-id-387'>
>        <subrange length='4' type-id='type-id-10' id='type-id-50'/>
>      </array-type-def>
> -    <class-decl name='dpaa_portal_dqrr' size-in-bits='1152'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='187' column='1'
> id='type-id-390'>
> +    <class-decl name='dpaa_portal_dqrr' size-in-bits='1152'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='187' column='1'
> id='type-id-388'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='mbuf' type-id='type-id-388' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='188'
> column='1'/>
> +        <var-decl name='mbuf' type-id='type-id-386' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='188'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
>          <var-decl name='dqrr_held' type-id='type-id-11'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='189' column='1'/>
> @@ -3139,62 +3144,62 @@
>          <var-decl name='dqrr_size' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='190' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_dpaa_driver' size-in-bits='640' is-struct='yes'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='87' column='1' id='type-id-391'>
> +    <class-decl name='rte_dpaa_driver' size-in-bits='640' is-struct='yes'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='87' column='1' id='type-id-389'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-392' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='88' column='1'/>
> +        <var-decl name='next' type-id='type-id-390' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='88' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='driver' type-id='type-id-393'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='89' column='1'/>
> +        <var-decl name='driver' type-id='type-id-391'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='89' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='dpaa_bus' type-id='type-id-394'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='90' column='1'/>
> +        <var-decl name='dpaa_bus' type-id='type-id-392'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='90' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='drv_type' type-id='type-id-395'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='91' column='1'/>
> +        <var-decl name='drv_type' type-id='type-id-393'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='91' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='probe' type-id='type-id-396' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='92' column='1'/>
> +        <var-decl name='probe' type-id='type-id-394' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='92' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='remove' type-id='type-id-397'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='93' column='1'/>
> +        <var-decl name='remove' type-id='type-id-395'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='93' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='88' column='1'
> id='type-id-392'>
> +    <class-decl name='__anonymous_struct__' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='88' column='1'
> id='type-id-390'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqe_next' type-id='type-id-398'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='88' column='1'/>
> +        <var-decl name='tqe_next' type-id='type-id-396'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='88' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqe_prev' type-id='type-id-399'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='88' column='1'/>
> +        <var-decl name='tqe_prev' type-id='type-id-397'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='88' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_driver' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='89'
> column='1' id='type-id-393'>
> +    <class-decl name='rte_driver' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='89'
> column='1' id='type-id-391'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-400' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='90'
> column='1'/>
> +        <var-decl name='next' type-id='type-id-398' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='90'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='name' type-id='type-id-401' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='91'
> column='1'/>
> +        <var-decl name='name' type-id='type-id-399' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='91'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='alias' type-id='type-id-401' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='92'
> column='1'/>
> +        <var-decl name='alias' type-id='type-id-399' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='92'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__1' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='90'
> column='1' id='type-id-400'>
> +    <class-decl name='__anonymous_struct__1' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='90'
> column='1' id='type-id-398'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqe_next' type-id='type-id-402'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='90'
> column='1'/>
> +        <var-decl name='tqe_next' type-id='type-id-400'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='90'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqe_prev' type-id='type-id-403'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='90'
> column='1'/>
> +        <var-decl name='tqe_prev' type-id='type-id-401'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='90'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_dpaa_bus' size-in-bits='1344' is-struct='yes'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='55' column='1' id='type-id-404'>
> +    <class-decl name='rte_dpaa_bus' size-in-bits='1344' is-struct='yes'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='55' column='1' id='type-id-402'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='bus' type-id='type-id-405' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='56' column='1'/>
> +        <var-decl name='bus' type-id='type-id-403' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='56' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
> -        <var-decl name='device_list' type-id='type-id-406'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='57' column='1'/>
> +        <var-decl name='device_list' type-id='type-id-404'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='57' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
> -        <var-decl name='driver_list' type-id='type-id-407'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='58' column='1'/>
> +        <var-decl name='driver_list' type-id='type-id-405'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='58' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1280'>
>          <var-decl name='device_count' type-id='type-id-1'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='59' column='1'/>
> @@ -3203,304 +3208,304 @@
>          <var-decl name='detected' type-id='type-id-1'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='60' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_bus' size-in-bits='1024' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='246'
> column='1' id='type-id-405'>
> +    <class-decl name='rte_bus' size-in-bits='1024' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='246'
> column='1' id='type-id-403'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-408' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247'
> column='1'/>
> +        <var-decl name='next' type-id='type-id-406' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='name' type-id='type-id-401' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='248'
> column='1'/>
> +        <var-decl name='name' type-id='type-id-399' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='248'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='scan' type-id='type-id-409' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='249'
> column='1'/>
> +        <var-decl name='scan' type-id='type-id-407' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='249'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='probe' type-id='type-id-410' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='250'
> column='1'/>
> +        <var-decl name='probe' type-id='type-id-408' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='250'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='find_device' type-id='type-id-411'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='251'
> column='1'/>
> +        <var-decl name='find_device' type-id='type-id-409'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='251'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='plug' type-id='type-id-412' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='252'
> column='1'/>
> +        <var-decl name='plug' type-id='type-id-410' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='252'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='unplug' type-id='type-id-413'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='253'
> column='1'/>
> +        <var-decl name='unplug' type-id='type-id-411'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='253'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='parse' type-id='type-id-414' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='254'
> column='1'/>
> +        <var-decl name='parse' type-id='type-id-412' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='254'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='dma_map' type-id='type-id-415'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='255'
> column='1'/>
> +        <var-decl name='dma_map' type-id='type-id-413'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='255'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='dma_unmap' type-id='type-id-416'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='256'
> column='1'/>
> +        <var-decl name='dma_unmap' type-id='type-id-414'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='256'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='conf' type-id='type-id-417' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='257'
> column='1'/>
> +        <var-decl name='conf' type-id='type-id-415' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='257'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='get_iommu_class' type-id='type-id-418'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='258'
> column='1'/>
> +        <var-decl name='get_iommu_class' type-id='type-id-416'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='258'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
> -        <var-decl name='dev_iterate' type-id='type-id-419'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='259'
> column='1'/>
> +        <var-decl name='dev_iterate' type-id='type-id-417'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='259'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='hot_unplug_handler' type-id='type-id-420'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='260'
> column='1'/>
> +        <var-decl name='hot_unplug_handler' type-id='type-id-418'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='260'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
> -        <var-decl name='sigbus_handler' type-id='type-id-421'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='262'
> column='1'/>
> +        <var-decl name='sigbus_handler' type-id='type-id-419'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='262'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__2' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247'
> column='1' id='type-id-408'>
> +    <class-decl name='__anonymous_struct__2' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247'
> column='1' id='type-id-406'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqe_next' type-id='type-id-422'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247'
> column='1'/>
> +        <var-decl name='tqe_next' type-id='type-id-420'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqe_prev' type-id='type-id-423'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247'
> column='1'/>
> +        <var-decl name='tqe_prev' type-id='type-id-421'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='247'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='rte_bus_scan_t' type-id='type-id-424'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='56'
> column='1' id='type-id-409'/>
> -    <typedef-decl name='rte_bus_probe_t' type-id='type-id-424'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='68'
> column='1' id='type-id-410'/>
> -    <typedef-decl name='rte_bus_find_device_t' type-id='type-id-425'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='93'
> column='1' id='type-id-411'/>
> -    <class-decl name='rte_device' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='104'
> column='1' id='type-id-426'>
> +    <typedef-decl name='rte_bus_scan_t' type-id='type-id-422'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='56'
> column='1' id='type-id-407'/>
> +    <typedef-decl name='rte_bus_probe_t' type-id='type-id-422'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='68'
> column='1' id='type-id-408'/>
> +    <typedef-decl name='rte_bus_find_device_t' type-id='type-id-423'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='93'
> column='1' id='type-id-409'/>
> +    <class-decl name='rte_device' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='104'
> column='1' id='type-id-424'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-427' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='105'
> column='1'/>
> +        <var-decl name='next' type-id='type-id-425' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='105'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='name' type-id='type-id-401' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='106'
> column='1'/>
> +        <var-decl name='name' type-id='type-id-399' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='106'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='driver' type-id='type-id-428'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='107'
> column='1'/>
> +        <var-decl name='driver' type-id='type-id-426'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='107'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='bus' type-id='type-id-429' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='108'
> column='1'/>
> +        <var-decl name='bus' type-id='type-id-427' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='108'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <var-decl name='numa_node' type-id='type-id-1'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='109'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='devargs' type-id='type-id-430'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='110'
> column='1'/>
> +        <var-decl name='devargs' type-id='type-id-428'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='110'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__3' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='105'
> column='1' id='type-id-427'>
> +    <class-decl name='__anonymous_struct__3' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='105'
> column='1' id='type-id-425'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqe_next' type-id='type-id-431'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='105'
> column='1'/>
> +        <var-decl name='tqe_next' type-id='type-id-429'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='105'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqe_prev' type-id='type-id-432'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='105'
> column='1'/>
> +        <var-decl name='tqe_prev' type-id='type-id-430'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='105'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_devargs' size-in-bits='1088' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='47'
> column='1' id='type-id-433'>
> +    <class-decl name='rte_devargs' size-in-bits='1088' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='47'
> column='1' id='type-id-431'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-434' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='49'
> column='1'/>
> +        <var-decl name='next' type-id='type-id-432' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='49'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='type' type-id='type-id-435' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='51'
> column='1'/>
> +        <var-decl name='type' type-id='type-id-433' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='51'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='160'>
> -        <var-decl name='policy' type-id='type-id-436'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='53'
> column='1'/>
> +        <var-decl name='policy' type-id='type-id-434'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='53'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='name' type-id='type-id-360' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='55'
> column='1'/>
> +        <var-decl name='name' type-id='type-id-358' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='55'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='' type-id='type-id-437' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='57'
> column='1'/>
> +        <var-decl name='' type-id='type-id-435' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='57'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='bus' type-id='type-id-422' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='62'
> column='1'/>
> +        <var-decl name='bus' type-id='type-id-420' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='62'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
> -        <var-decl name='cls' type-id='type-id-438' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='63'
> column='1'/>
> +        <var-decl name='cls' type-id='type-id-436' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='63'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='bus_str' type-id='type-id-401'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='64'
> column='1'/>
> +        <var-decl name='bus_str' type-id='type-id-399'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='64'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
> -        <var-decl name='cls_str' type-id='type-id-401'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='65'
> column='1'/>
> +        <var-decl name='cls_str' type-id='type-id-399'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='65'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
> -        <var-decl name='data' type-id='type-id-401' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='66'
> column='1'/>
> +        <var-decl name='data' type-id='type-id-399' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='66'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__4' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='49'
> column='1' id='type-id-434'>
> +    <class-decl name='__anonymous_struct__4' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='49'
> column='1' id='type-id-432'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqe_next' type-id='type-id-430'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='49'
> column='1'/>
> +        <var-decl name='tqe_next' type-id='type-id-428'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='49'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqe_prev' type-id='type-id-439'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='49'
> column='1'/>
> +        <var-decl name='tqe_prev' type-id='type-id-437'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='49'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_devtype'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='31'
> column='1' id='type-id-435'>
> +    <enum-decl name='rte_devtype'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='31'
> column='1' id='type-id-433'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_DEVTYPE_WHITELISTED_PCI' value='0'/>
>        <enumerator name='RTE_DEVTYPE_BLACKLISTED_PCI' value='1'/>
>        <enumerator name='RTE_DEVTYPE_VIRTUAL' value='2'/>
>      </enum-decl>
> -    <enum-decl name='rte_dev_policy'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='72'
> column='1' id='type-id-436'>
> +    <enum-decl name='rte_dev_policy'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='72'
> column='1' id='type-id-434'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_DEV_WHITELISTED' value='0'/>
>        <enumerator name='RTE_DEV_BLACKLISTED' value='1'/>
>      </enum-decl>
> -    <union-decl name='__anonymous_union__' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='57'
> column='1' id='type-id-437'>
> +    <union-decl name='__anonymous_union__' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='57'
> column='1' id='type-id-435'>
>        <data-member access='private'>
> -        <var-decl name='args' type-id='type-id-440' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='59'
> column='1'/>
> +        <var-decl name='args' type-id='type-id-438' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='59'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='drv_str' type-id='type-id-401'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='60'
> column='1'/>
> +        <var-decl name='drv_str' type-id='type-id-399'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='60'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <typedef-decl name='rte_dev_cmp_t' type-id='type-id-441'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='202'
> column='1' id='type-id-442'/>
> -    <typedef-decl name='rte_bus_plug_t' type-id='type-id-443'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='107'
> column='1' id='type-id-412'/>
> -    <typedef-decl name='rte_bus_unplug_t' type-id='type-id-443'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='120'
> column='1' id='type-id-413'/>
> -    <typedef-decl name='rte_bus_parse_t' type-id='type-id-444'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='140'
> column='1' id='type-id-414'/>
> -    <typedef-decl name='rte_dev_dma_map_t' type-id='type-id-445'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='160'
> column='1' id='type-id-415'/>
> -    <typedef-decl name='rte_dev_dma_unmap_t' type-id='type-id-445'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='181'
> column='1' id='type-id-416'/>
> -    <class-decl name='rte_bus_conf' size-in-bits='32' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='225'
> column='1' id='type-id-417'>
> +    <typedef-decl name='rte_dev_cmp_t' type-id='type-id-439'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='202'
> column='1' id='type-id-440'/>
> +    <typedef-decl name='rte_bus_plug_t' type-id='type-id-441'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='107'
> column='1' id='type-id-410'/>
> +    <typedef-decl name='rte_bus_unplug_t' type-id='type-id-441'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='120'
> column='1' id='type-id-411'/>
> +    <typedef-decl name='rte_bus_parse_t' type-id='type-id-442'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='140'
> column='1' id='type-id-412'/>
> +    <typedef-decl name='rte_dev_dma_map_t' type-id='type-id-443'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='160'
> column='1' id='type-id-413'/>
> +    <typedef-decl name='rte_dev_dma_unmap_t' type-id='type-id-443'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='181'
> column='1' id='type-id-414'/>
> +    <class-decl name='rte_bus_conf' size-in-bits='32' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='225'
> column='1' id='type-id-415'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='scan_mode' type-id='type-id-446'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='226'
> column='1'/>
> +        <var-decl name='scan_mode' type-id='type-id-444'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='226'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_bus_scan_mode'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='216'
> column='1' id='type-id-446'>
> +    <enum-decl name='rte_bus_scan_mode'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='216'
> column='1' id='type-id-444'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_BUS_SCAN_UNDEFINED' value='0'/>
>        <enumerator name='RTE_BUS_SCAN_WHITELIST' value='1'/>
>        <enumerator name='RTE_BUS_SCAN_BLACKLIST' value='2'/>
>      </enum-decl>
> -    <typedef-decl name='rte_bus_get_iommu_class_t' type-id='type-id-447'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='240'
> column='1' id='type-id-418'/>
> -    <enum-decl name='rte_iova_mode'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='39'
> column='1' id='type-id-448'>
> +    <typedef-decl name='rte_bus_get_iommu_class_t' type-id='type-id-445'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='240'
> column='1' id='type-id-416'/>
> +    <enum-decl name='rte_iova_mode'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='39'
> column='1' id='type-id-446'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_IOVA_DC' value='0'/>
>        <enumerator name='RTE_IOVA_PA' value='1'/>
>        <enumerator name='RTE_IOVA_VA' value='2'/>
>      </enum-decl>
> -    <typedef-decl name='rte_dev_iterate_t' type-id='type-id-449'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='288'
> column='1' id='type-id-419'/>
> -    <class-decl name='rte_dev_iterator' size-in-bits='448'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='250'
> column='1' id='type-id-450'>
> +    <typedef-decl name='rte_dev_iterate_t' type-id='type-id-447'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='288'
> column='1' id='type-id-417'/>
> +    <class-decl name='rte_dev_iterator' size-in-bits='448'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='250'
> column='1' id='type-id-448'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='dev_str' type-id='type-id-401'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='251'
> column='1'/>
> +        <var-decl name='dev_str' type-id='type-id-399'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='251'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='bus_str' type-id='type-id-401'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='252'
> column='1'/>
> +        <var-decl name='bus_str' type-id='type-id-399'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='252'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='cls_str' type-id='type-id-401'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='253'
> column='1'/>
> +        <var-decl name='cls_str' type-id='type-id-399'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='253'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='bus' type-id='type-id-422' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='254'
> column='1'/>
> +        <var-decl name='bus' type-id='type-id-420' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='254'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='cls' type-id='type-id-438' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='255'
> column='1'/>
> +        <var-decl name='cls' type-id='type-id-436' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='255'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='device' type-id='type-id-431'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='256'
> column='1'/>
> +        <var-decl name='device' type-id='type-id-429'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='256'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <var-decl name='class_device' type-id='type-id-59'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='257'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='rte_bus_hot_unplug_handler_t'
> type-id='type-id-443'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='196'
> column='1' id='type-id-420'/>
> -    <typedef-decl name='rte_bus_sigbus_handler_t' type-id='type-id-451'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='211'
> column='1' id='type-id-421'/>
> -    <class-decl name='rte_dpaa_device_list' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='44' column='1'
> id='type-id-406'>
> +    <typedef-decl name='rte_bus_hot_unplug_handler_t'
> type-id='type-id-441'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='196'
> column='1' id='type-id-418'/>
> +    <typedef-decl name='rte_bus_sigbus_handler_t' type-id='type-id-449'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_bus.h' line='211'
> column='1' id='type-id-419'/>
> +    <class-decl name='rte_dpaa_device_list' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='44' column='1'
> id='type-id-404'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqh_first' type-id='type-id-452'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='44' column='1'/>
> +        <var-decl name='tqh_first' type-id='type-id-450'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='44' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqh_last' type-id='type-id-453'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='44' column='1'/>
> +        <var-decl name='tqh_last' type-id='type-id-451'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='44' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_dpaa_device' size-in-bits='214592'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='69' column='1'
> id='type-id-454'>
> +    <class-decl name='rte_dpaa_device' size-in-bits='214592'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='69' column='1'
> id='type-id-452'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-455' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='70' column='1'/>
> +        <var-decl name='next' type-id='type-id-453' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='70' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='device' type-id='type-id-426'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='71' column='1'/>
> +        <var-decl name='device' type-id='type-id-424'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='71' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='' type-id='type-id-456' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='72' column='1'/>
> +        <var-decl name='' type-id='type-id-454' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='72' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='driver' type-id='type-id-398'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='76' column='1'/>
> +        <var-decl name='driver' type-id='type-id-396'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='76' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='id' type-id='type-id-457' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='77' column='1'/>
> +        <var-decl name='id' type-id='type-id-455' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='77' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='intr_handle' type-id='type-id-458'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='78' column='1'/>
> +        <var-decl name='intr_handle' type-id='type-id-456'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='78' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='214016'>
> -        <var-decl name='device_type' type-id='type-id-395'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='79' column='1'/>
> +        <var-decl name='device_type' type-id='type-id-393'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='79' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='214048'>
> -        <var-decl name='name' type-id='type-id-360' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='80' column='1'/>
> +        <var-decl name='name' type-id='type-id-358' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='80' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__5' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='70' column='1'
> id='type-id-455'>
> +    <class-decl name='__anonymous_struct__5' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='70' column='1'
> id='type-id-453'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqe_next' type-id='type-id-452'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='70' column='1'/>
> +        <var-decl name='tqe_next' type-id='type-id-450'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='70' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqe_prev' type-id='type-id-453'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='70' column='1'/>
> +        <var-decl name='tqe_prev' type-id='type-id-451'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='70' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__1' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='72' column='1'
> id='type-id-456'>
> +    <union-decl name='__anonymous_union__1' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='72' column='1'
> id='type-id-454'>
>        <data-member access='private'>
> -        <var-decl name='eth_dev' type-id='type-id-459'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='73' column='1'/>
> +        <var-decl name='eth_dev' type-id='type-id-457'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='73' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='crypto_dev' type-id='type-id-460'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='74' column='1'/>
> +        <var-decl name='crypto_dev' type-id='type-id-458'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='74' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='rte_eth_dev' size-in-bits='132608' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='777'
> column='1' id='type-id-461'>
> +    <class-decl name='rte_eth_dev' size-in-bits='132608' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='777'
> column='1' id='type-id-459'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='rx_pkt_burst' type-id='type-id-462'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='778'
> column='1'/>
> +        <var-decl name='rx_pkt_burst' type-id='type-id-460'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='778'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tx_pkt_burst' type-id='type-id-463'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='779'
> column='1'/>
> +        <var-decl name='tx_pkt_burst' type-id='type-id-461'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='779'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='tx_pkt_prepare' type-id='type-id-464'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='780'
> column='1'/>
> +        <var-decl name='tx_pkt_prepare' type-id='type-id-462'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='780'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='data' type-id='type-id-465' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='786'
> column='1'/>
> +        <var-decl name='data' type-id='type-id-463' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='786'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <var-decl name='process_private' type-id='type-id-59'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='787'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='dev_ops' type-id='type-id-466'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='788'
> column='1'/>
> +        <var-decl name='dev_ops' type-id='type-id-464'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='788'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='device' type-id='type-id-431'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='789'
> column='1'/>
> +        <var-decl name='device' type-id='type-id-429'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='789'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='intr_handle' type-id='type-id-467'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='790'
> column='1'/>
> +        <var-decl name='intr_handle' type-id='type-id-465'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='790'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='link_intr_cbs' type-id='type-id-468'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='792'
> column='1'/>
> +        <var-decl name='link_intr_cbs' type-id='type-id-466'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='792'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='post_rx_burst_cbs' type-id='type-id-377'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='797'
> column='1'/>
> +        <var-decl name='post_rx_burst_cbs' type-id='type-id-375'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='797'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='66176'>
> -        <var-decl name='pre_tx_burst_cbs' type-id='type-id-377'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='802'
> column='1'/>
> +        <var-decl name='pre_tx_burst_cbs' type-id='type-id-375'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='802'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='131712'>
> -        <var-decl name='state' type-id='type-id-469' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='803'
> column='1'/>
> +        <var-decl name='state' type-id='type-id-467' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='803'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='131776'>
>          <var-decl name='security_ctx' type-id='type-id-59'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='804'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='131840'>
> -        <var-decl name='reserved_64s' type-id='type-id-383'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='806'
> column='1'/>
> +        <var-decl name='reserved_64s' type-id='type-id-381'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='806'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='132096'>
> -        <var-decl name='reserved_ptrs' type-id='type-id-389'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='807'
> column='1'/>
> +        <var-decl name='reserved_ptrs' type-id='type-id-387'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='807'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_rx_burst_t' type-id='type-id-470'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='340'
> column='1' id='type-id-462'/>
> -    <typedef-decl name='eth_tx_burst_t' type-id='type-id-470'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='345'
> column='1' id='type-id-463'/>
> -    <typedef-decl name='eth_tx_prep_t' type-id='type-id-470'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='350'
> column='1' id='type-id-464'/>
> -    <class-decl name='rte_eth_dev_data' size-in-bits='55808'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='820'
> column='1' id='type-id-471'>
> +    <typedef-decl name='eth_rx_burst_t' type-id='type-id-468'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='340'
> column='1' id='type-id-460'/>
> +    <typedef-decl name='eth_tx_burst_t' type-id='type-id-468'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='345'
> column='1' id='type-id-461'/>
> +    <typedef-decl name='eth_tx_prep_t' type-id='type-id-468'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='350'
> column='1' id='type-id-462'/>
> +    <class-decl name='rte_eth_dev_data' size-in-bits='55808'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='820'
> column='1' id='type-id-469'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='name' type-id='type-id-360' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='821'
> column='1'/>
> +        <var-decl name='name' type-id='type-id-358' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='821'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
>          <var-decl name='rx_queues' type-id='type-id-240'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='823'
> column='1'/>
> @@ -3515,16 +3520,16 @@
>          <var-decl name='nb_tx_queues' type-id='type-id-4'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='826'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='672'>
> -        <var-decl name='sriov' type-id='type-id-472' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='828'
> column='1'/>
> +        <var-decl name='sriov' type-id='type-id-470' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='828'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
>          <var-decl name='dev_private' type-id='type-id-59'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='830'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
> -        <var-decl name='dev_link' type-id='type-id-473'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='835'
> column='1'/>
> +        <var-decl name='dev_link' type-id='type-id-471'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='835'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='dev_conf' type-id='type-id-474'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='836'
> column='1'/>
> +        <var-decl name='dev_conf' type-id='type-id-472'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='836'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='25536'>
>          <var-decl name='mtu' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='837'
> column='1'/>
> @@ -3536,13 +3541,13 @@
>          <var-decl name='rx_mbuf_alloc_failed' type-id='type-id-11'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='841'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='25664'>
> -        <var-decl name='mac_addrs' type-id='type-id-475'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='842'
> column='1'/>
> +        <var-decl name='mac_addrs' type-id='type-id-473'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='842'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='25728'>
> -        <var-decl name='mac_pool_sel' type-id='type-id-381'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='846'
> column='1'/>
> +        <var-decl name='mac_pool_sel' type-id='type-id-379'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='846'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='33920'>
> -        <var-decl name='hash_mac_addrs' type-id='type-id-475'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='848'
> column='1'/>
> +        <var-decl name='hash_mac_addrs' type-id='type-id-473'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='848'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='33984'>
>          <var-decl name='port_id' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='852'
> column='1'/>
> @@ -3563,37 +3568,37 @@
>          <var-decl name='lro' type-id='type-id-14' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='859'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='34008'>
> -        <var-decl name='rx_queue_state' type-id='type-id-385'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='860'
> column='1'/>
> +        <var-decl name='rx_queue_state' type-id='type-id-383'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='860'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='42200'>
> -        <var-decl name='tx_queue_state' type-id='type-id-385'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='862'
> column='1'/>
> +        <var-decl name='tx_queue_state' type-id='type-id-383'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='862'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='50400'>
>          <var-decl name='dev_flags' type-id='type-id-7'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='864'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='50432'>
> -        <var-decl name='kdrv' type-id='type-id-476' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='865'
> column='1'/>
> +        <var-decl name='kdrv' type-id='type-id-474' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='865'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='50464'>
>          <var-decl name='numa_node' type-id='type-id-1'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='866'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='50496'>
> -        <var-decl name='vlan_filter_conf' type-id='type-id-477'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='867'
> column='1'/>
> +        <var-decl name='vlan_filter_conf' type-id='type-id-475'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='867'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='54592'>
> -        <var-decl name='owner' type-id='type-id-478' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='869'
> column='1'/>
> +        <var-decl name='owner' type-id='type-id-476' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='869'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='55168'>
>          <var-decl name='representor_id' type-id='type-id-4'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='870'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='55232'>
> -        <var-decl name='reserved_64s' type-id='type-id-383'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='875'
> column='1'/>
> +        <var-decl name='reserved_64s' type-id='type-id-381'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='875'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='55488'>
> -        <var-decl name='reserved_ptrs' type-id='type-id-389'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='876'
> column='1'/>
> +        <var-decl name='reserved_ptrs' type-id='type-id-387'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='876'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_dev_sriov' size-in-bits='48'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1476' column='1'
> id='type-id-472'>
> +    <class-decl name='rte_eth_dev_sriov' size-in-bits='48'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1476' column='1'
> id='type-id-470'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='active' type-id='type-id-14' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1477'
> column='1'/>
>        </data-member>
> @@ -3607,7 +3612,7 @@
>          <var-decl name='def_pool_q_idx' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1480' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_link' size-in-bits='64' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='308' column='1' id='type-id-473'>
> +    <class-decl name='rte_eth_link' size-in-bits='64' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='308' column='1' id='type-id-471'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='link_speed' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='309' column='1'/>
>        </data-member>
> @@ -3621,38 +3626,38 @@
>          <var-decl name='link_status' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='312' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_conf' size-in-bits='24640' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1045' column='1' id='type-id-474'>
> +    <class-decl name='rte_eth_conf' size-in-bits='24640' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1045' column='1' id='type-id-472'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='link_speeds' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1046' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='rxmode' type-id='type-id-479'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1053' column='1'/>
> +        <var-decl name='rxmode' type-id='type-id-477'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1053' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='txmode' type-id='type-id-480'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1054' column='1'/>
> +        <var-decl name='txmode' type-id='type-id-478'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1054' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
>          <var-decl name='lpbk_mode' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1055' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
> -        <var-decl name='rx_adv_conf' type-id='type-id-481'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1068' column='1'/>
> +        <var-decl name='rx_adv_conf' type-id='type-id-479'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1068' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17984'>
> -        <var-decl name='tx_adv_conf' type-id='type-id-482'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1076' column='1'/>
> +        <var-decl name='tx_adv_conf' type-id='type-id-480'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1076' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='18080'>
>          <var-decl name='dcb_capability_en' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1079' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='18112'>
> -        <var-decl name='fdir_conf' type-id='type-id-483'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1080' column='1'/>
> +        <var-decl name='fdir_conf' type-id='type-id-481'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1080' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='24576'>
> -        <var-decl name='intr_conf' type-id='type-id-484'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1081' column='1'/>
> +        <var-decl name='intr_conf' type-id='type-id-482'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1081' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_rxmode' size-in-bits='448' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='394' column='1' id='type-id-479'>
> +    <class-decl name='rte_eth_rxmode' size-in-bits='448' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='394' column='1' id='type-id-477'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='mq_mode' type-id='type-id-485'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='396' column='1'/>
> +        <var-decl name='mq_mode' type-id='type-id-483'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='396' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='max_rx_pkt_len' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='397' column='1'/>
> @@ -3673,7 +3678,7 @@
>          <var-decl name='reserved_ptrs' type-id='type-id-60'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='409' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_eth_rx_mq_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='344' column='1'
> id='type-id-485'>
> +    <enum-decl name='rte_eth_rx_mq_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='344' column='1'
> id='type-id-483'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='ETH_MQ_RX_NONE' value='0'/>
>        <enumerator name='ETH_MQ_RX_RSS' value='1'/>
> @@ -3684,9 +3689,9 @@
>        <enumerator name='ETH_MQ_RX_VMDQ_DCB' value='6'/>
>        <enumerator name='ETH_MQ_RX_VMDQ_DCB_RSS' value='7'/>
>      </enum-decl>
> -    <class-decl name='rte_eth_txmode' size-in-bits='448' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='792' column='1' id='type-id-480'>
> +    <class-decl name='rte_eth_txmode' size-in-bits='448' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='792' column='1' id='type-id-478'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='mq_mode' type-id='type-id-486'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='793' column='1'/>
> +        <var-decl name='mq_mode' type-id='type-id-484'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='793' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='offloads' type-id='type-id-11'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='799' column='1'/>
> @@ -3710,28 +3715,28 @@
>          <var-decl name='reserved_ptrs' type-id='type-id-60'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='812' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_eth_tx_mq_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='377' column='1'
> id='type-id-486'>
> +    <enum-decl name='rte_eth_tx_mq_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='377' column='1'
> id='type-id-484'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='ETH_MQ_TX_NONE' value='0'/>
>        <enumerator name='ETH_MQ_TX_DCB' value='1'/>
>        <enumerator name='ETH_MQ_TX_VMDQ_DCB' value='2'/>
>        <enumerator name='ETH_MQ_TX_VMDQ_ONLY' value='3'/>
>      </enum-decl>
> -    <class-decl name='__anonymous_struct__6' size-in-bits='16960'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1060' column='1'
> id='type-id-481'>
> +    <class-decl name='__anonymous_struct__6' size-in-bits='16960'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1060' column='1'
> id='type-id-479'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='rss_conf' type-id='type-id-487'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1061' column='1'/>
> +        <var-decl name='rss_conf' type-id='type-id-485'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1061' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='vmdq_dcb_conf' type-id='type-id-488'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1062' column='1'/>
> +        <var-decl name='vmdq_dcb_conf' type-id='type-id-486'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1062' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8512'>
> -        <var-decl name='dcb_rx_conf' type-id='type-id-489'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1064' column='1'/>
> +        <var-decl name='dcb_rx_conf' type-id='type-id-487'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1064' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8640'>
> -        <var-decl name='vmdq_rx_conf' type-id='type-id-490'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1066' column='1'/>
> +        <var-decl name='vmdq_rx_conf' type-id='type-id-488'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1066' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_rss_conf' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='448' column='1'
> id='type-id-487'>
> +    <class-decl name='rte_eth_rss_conf' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='448' column='1'
> id='type-id-485'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='rss_key' type-id='type-id-36'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='449' column='1'/>
>        </data-member>
> @@ -3742,9 +3747,9 @@
>          <var-decl name='rss_hf' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='451' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_vmdq_dcb_conf' size-in-bits='8320'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='745' column='1'
> id='type-id-488'>
> +    <class-decl name='rte_eth_vmdq_dcb_conf' size-in-bits='8320'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='745' column='1'
> id='type-id-486'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='nb_queue_pools' type-id='type-id-491'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='746' column='1'/>
> +        <var-decl name='nb_queue_pools' type-id='type-id-489'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='746' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='enable_default_pool' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='747' column='1'/>
> @@ -3759,10 +3764,10 @@
>          <var-decl name='pool_map' type-id='type-id-352'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='753' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8256'>
> -        <var-decl name='dcb_tc' type-id='type-id-387'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='754' column='1'/>
> +        <var-decl name='dcb_tc' type-id='type-id-385'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='754' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_eth_nb_pools'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='704' column='1'
> id='type-id-491'>
> +    <enum-decl name='rte_eth_nb_pools'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='704' column='1'
> id='type-id-489'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='ETH_8_POOLS' value='8'/>
>        <enumerator name='ETH_16_POOLS' value='16'/>
> @@ -3777,22 +3782,22 @@
>          <var-decl name='pools' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='752' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_dcb_rx_conf' size-in-bits='96'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='712' column='1'
> id='type-id-489'>
> +    <class-decl name='rte_eth_dcb_rx_conf' size-in-bits='96'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='712' column='1'
> id='type-id-487'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='nb_tcs' type-id='type-id-492'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='713' column='1'/>
> +        <var-decl name='nb_tcs' type-id='type-id-490'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='713' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='dcb_tc' type-id='type-id-387'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='715' column='1'/>
> +        <var-decl name='dcb_tc' type-id='type-id-385'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='715' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_eth_nb_tcs'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='695' column='1'
> id='type-id-492'>
> +    <enum-decl name='rte_eth_nb_tcs'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='695' column='1'
> id='type-id-490'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='ETH_4_TCS' value='4'/>
>        <enumerator name='ETH_8_TCS' value='8'/>
>      </enum-decl>
> -    <class-decl name='rte_eth_vmdq_rx_conf' size-in-bits='8320'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='776' column='1'
> id='type-id-490'>
> +    <class-decl name='rte_eth_vmdq_rx_conf' size-in-bits='8320'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='776' column='1'
> id='type-id-488'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='nb_queue_pools' type-id='type-id-491'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='777' column='1'/>
> +        <var-decl name='nb_queue_pools' type-id='type-id-489'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='777' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='enable_default_pool' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='778' column='1'/>
> @@ -3810,70 +3815,62 @@
>          <var-decl name='rx_mode' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='782' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='pool_map' type-id='type-id-354'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='786' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <class-decl name='__anonymous_struct__8' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='783' column='1'
> id='type-id-353'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='vlan_id' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='784' column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='pools' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='785' column='1'/>
> +        <var-decl name='pool_map' type-id='type-id-353'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='786' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__2' size-in-bits='96'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1069' column='1'
> id='type-id-482'>
> +    <union-decl name='__anonymous_union__2' size-in-bits='96'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1069' column='1'
> id='type-id-480'>
>        <data-member access='private'>
> -        <var-decl name='vmdq_dcb_tx_conf' type-id='type-id-493'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1070' column='1'/>
> +        <var-decl name='vmdq_dcb_tx_conf' type-id='type-id-491'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1070' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='dcb_tx_conf' type-id='type-id-494'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1072' column='1'/>
> +        <var-decl name='dcb_tx_conf' type-id='type-id-492'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1072' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='vmdq_tx_conf' type-id='type-id-495'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1074' column='1'/>
> +        <var-decl name='vmdq_tx_conf' type-id='type-id-493'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1074' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='rte_eth_vmdq_dcb_tx_conf' size-in-bits='96'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='718' column='1'
> id='type-id-493'>
> +    <class-decl name='rte_eth_vmdq_dcb_tx_conf' size-in-bits='96'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='718' column='1'
> id='type-id-491'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='nb_queue_pools' type-id='type-id-491'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='719' column='1'/>
> +        <var-decl name='nb_queue_pools' type-id='type-id-489'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='719' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='dcb_tc' type-id='type-id-387'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='721' column='1'/>
> +        <var-decl name='dcb_tc' type-id='type-id-385'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='721' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_dcb_tx_conf' size-in-bits='96'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='724' column='1'
> id='type-id-494'>
> +    <class-decl name='rte_eth_dcb_tx_conf' size-in-bits='96'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='724' column='1'
> id='type-id-492'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='nb_tcs' type-id='type-id-492'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='725' column='1'/>
> +        <var-decl name='nb_tcs' type-id='type-id-490'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='725' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='dcb_tc' type-id='type-id-387'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='727' column='1'/>
> +        <var-decl name='dcb_tc' type-id='type-id-385'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='727' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_vmdq_tx_conf' size-in-bits='32'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='730' column='1'
> id='type-id-495'>
> +    <class-decl name='rte_eth_vmdq_tx_conf' size-in-bits='32'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='730' column='1'
> id='type-id-493'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='nb_queue_pools' type-id='type-id-491'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='731' column='1'/>
> +        <var-decl name='nb_queue_pools' type-id='type-id-489'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='731' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_fdir_conf' size-in-bits='6464' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1005' column='1' id='type-id-483'>
> +    <class-decl name='rte_fdir_conf' size-in-bits='6464' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1005' column='1' id='type-id-481'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='mode' type-id='type-id-496' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1006'
> column='1'/>
> +        <var-decl name='mode' type-id='type-id-494' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1006'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='pballoc' type-id='type-id-497'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1007' column='1'/>
> +        <var-decl name='pballoc' type-id='type-id-495'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1007' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='status' type-id='type-id-498'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1008' column='1'/>
> +        <var-decl name='status' type-id='type-id-496'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1008' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
>          <var-decl name='drop_queue' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1010' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='mask' type-id='type-id-499' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1011'
> column='1'/>
> +        <var-decl name='mask' type-id='type-id-497' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1011'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='672'>
> -        <var-decl name='flex_conf' type-id='type-id-500'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1012' column='1'/>
> +        <var-decl name='flex_conf' type-id='type-id-498'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1012' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_fdir_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='603'
> column='1' id='type-id-496'>
> +    <enum-decl name='rte_fdir_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='603'
> column='1' id='type-id-494'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_FDIR_MODE_NONE' value='0'/>
>        <enumerator name='RTE_FDIR_MODE_SIGNATURE' value='1'/>
> @@ -3881,27 +3878,27 @@
>        <enumerator name='RTE_FDIR_MODE_PERFECT_MAC_VLAN' value='3'/>
>        <enumerator name='RTE_FDIR_MODE_PERFECT_TUNNEL' value='4'/>
>      </enum-decl>
> -    <enum-decl name='rte_fdir_pballoc_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='984' column='1'
> id='type-id-497'>
> +    <enum-decl name='rte_fdir_pballoc_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='984' column='1'
> id='type-id-495'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_FDIR_PBALLOC_64K' value='0'/>
>        <enumerator name='RTE_FDIR_PBALLOC_128K' value='1'/>
>        <enumerator name='RTE_FDIR_PBALLOC_256K' value='2'/>
>      </enum-decl>
> -    <enum-decl name='rte_fdir_status_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='993' column='1'
> id='type-id-498'>
> +    <enum-decl name='rte_fdir_status_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='993' column='1'
> id='type-id-496'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_FDIR_NO_REPORT_STATUS' value='0'/>
>        <enumerator name='RTE_FDIR_REPORT_STATUS' value='1'/>
>        <enumerator name='RTE_FDIR_REPORT_STATUS_ALWAYS' value='2'/>
>      </enum-decl>
> -    <class-decl name='rte_eth_fdir_masks' size-in-bits='544'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='533'
> column='1' id='type-id-499'>
> +    <class-decl name='rte_eth_fdir_masks' size-in-bits='544'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='533'
> column='1' id='type-id-497'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='vlan_tci_mask' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='534' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='ipv4_mask' type-id='type-id-501'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='536' column='1'/>
> +        <var-decl name='ipv4_mask' type-id='type-id-499'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='536' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='ipv6_mask' type-id='type-id-502'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='538' column='1'/>
> +        <var-decl name='ipv6_mask' type-id='type-id-500'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='538' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='416'>
>          <var-decl name='src_port_mask' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='540' column='1'/>
> @@ -3919,7 +3916,7 @@
>          <var-decl name='tunnel_type_mask' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='548' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_ipv4_flow' size-in-bits='96'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='342'
> column='1' id='type-id-501'>
> +    <class-decl name='rte_eth_ipv4_flow' size-in-bits='96'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='342'
> column='1' id='type-id-499'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='src_ip' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='343'
> column='1'/>
>        </data-member>
> @@ -3936,12 +3933,12 @@
>          <var-decl name='proto' type-id='type-id-14' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='347'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_ipv6_flow' size-in-bits='288'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='381'
> column='1' id='type-id-502'>
> +    <class-decl name='rte_eth_ipv6_flow' size-in-bits='288'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='381'
> column='1' id='type-id-500'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='src_ip' type-id='type-id-380'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='382' column='1'/>
> +        <var-decl name='src_ip' type-id='type-id-378'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='382' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='dst_ip' type-id='type-id-380'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='383' column='1'/>
> +        <var-decl name='dst_ip' type-id='type-id-378'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='383' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <var-decl name='tc' type-id='type-id-14' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='384'
> column='1'/>
> @@ -3953,7 +3950,7 @@
>          <var-decl name='hop_limits' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='386' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_fdir_flex_conf' size-in-bits='5792'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='591'
> column='1' id='type-id-500'>
> +    <class-decl name='rte_eth_fdir_flex_conf' size-in-bits='5792'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='591'
> column='1' id='type-id-498'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='nb_payloads' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='592' column='1'/>
>        </data-member>
> @@ -3961,21 +3958,21 @@
>          <var-decl name='nb_flexmasks' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='593' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='flex_set' type-id='type-id-373'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='594' column='1'/>
> +        <var-decl name='flex_set' type-id='type-id-371'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='594' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2336'>
> -        <var-decl name='flex_mask' type-id='type-id-370'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='596' column='1'/>
> +        <var-decl name='flex_mask' type-id='type-id-368'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='596' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_flex_payload_cfg' size-in-bits='288'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='568'
> column='1' id='type-id-372'>
> +    <class-decl name='rte_eth_flex_payload_cfg' size-in-bits='288'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='568'
> column='1' id='type-id-370'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='type' type-id='type-id-503' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='569'
> column='1'/>
> +        <var-decl name='type' type-id='type-id-501' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='569'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='src_offset' type-id='type-id-378'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='570' column='1'/>
> +        <var-decl name='src_offset' type-id='type-id-376'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='570' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_eth_payload_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='555'
> column='1' id='type-id-503'>
> +    <enum-decl name='rte_eth_payload_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='555'
> column='1' id='type-id-501'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_ETH_PAYLOAD_UNKNOWN' value='0'/>
>        <enumerator name='RTE_ETH_RAW_PAYLOAD' value='1'/>
> @@ -3984,15 +3981,15 @@
>        <enumerator name='RTE_ETH_L4_PAYLOAD' value='4'/>
>        <enumerator name='RTE_ETH_PAYLOAD_MAX' value='8'/>
>      </enum-decl>
> -    <class-decl name='rte_eth_fdir_flex_mask' size-in-bits='144'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='581'
> column='1' id='type-id-369'>
> +    <class-decl name='rte_eth_fdir_flex_mask' size-in-bits='144'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='581'
> column='1' id='type-id-367'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='flow_type' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='582' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16'>
> -        <var-decl name='mask' type-id='type-id-386' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='583'
> column='1'/>
> +        <var-decl name='mask' type-id='type-id-384' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='583'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_intr_conf' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1031' column='1' id='type-id-484'>
> +    <class-decl name='rte_intr_conf' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1031' column='1' id='type-id-482'>
>        <data-member access='public' layout-offset-in-bits='31'>
>          <var-decl name='lsc' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1033'
> column='1'/>
>        </data-member>
> @@ -4003,7 +4000,7 @@
>          <var-decl name='rmv' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1037'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_kernel_driver'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='60'
> column='1' id='type-id-476'>
> +    <enum-decl name='rte_kernel_driver'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_dev.h' line='60'
> column='1' id='type-id-474'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_KDRV_UNKNOWN' value='0'/>
>        <enumerator name='RTE_KDRV_IGB_UIO' value='1'/>
> @@ -4012,325 +4009,325 @@
>        <enumerator name='RTE_KDRV_NIC_UIO' value='4'/>
>        <enumerator name='RTE_KDRV_NONE' value='5'/>
>      </enum-decl>
> -    <class-decl name='rte_vlan_filter_conf' size-in-bits='4096'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='427' column='1'
> id='type-id-477'>
> +    <class-decl name='rte_vlan_filter_conf' size-in-bits='4096'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='427' column='1'
> id='type-id-475'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='ids' type-id='type-id-384' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='428' column='1'/>
> +        <var-decl name='ids' type-id='type-id-382' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='428' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_dev_owner' size-in-bits='576'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1490' column='1'
> id='type-id-478'>
> +    <class-decl name='rte_eth_dev_owner' size-in-bits='576'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1490' column='1'
> id='type-id-476'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='id' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1491'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='name' type-id='type-id-360' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1492'
> column='1'/>
> +        <var-decl name='name' type-id='type-id-358' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1492'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='eth_dev_ops' size-in-bits='6016' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='609'
> column='1' id='type-id-504'>
> +    <class-decl name='eth_dev_ops' size-in-bits='6016' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='609'
> column='1' id='type-id-502'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='dev_configure' type-id='type-id-505'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='610'
> column='1'/>
> +        <var-decl name='dev_configure' type-id='type-id-503'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='610'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='dev_start' type-id='type-id-506'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='611'
> column='1'/>
> +        <var-decl name='dev_start' type-id='type-id-504'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='611'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='dev_stop' type-id='type-id-507'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='612'
> column='1'/>
> +        <var-decl name='dev_stop' type-id='type-id-505'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='612'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='dev_set_link_up' type-id='type-id-508'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='613'
> column='1'/>
> +        <var-decl name='dev_set_link_up' type-id='type-id-506'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='613'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='dev_set_link_down' type-id='type-id-509'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='614'
> column='1'/>
> +        <var-decl name='dev_set_link_down' type-id='type-id-507'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='614'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='dev_close' type-id='type-id-510'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='615'
> column='1'/>
> +        <var-decl name='dev_close' type-id='type-id-508'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='615'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='dev_reset' type-id='type-id-511'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='616'
> column='1'/>
> +        <var-decl name='dev_reset' type-id='type-id-509'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='616'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='link_update' type-id='type-id-512'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='617'
> column='1'/>
> +        <var-decl name='link_update' type-id='type-id-510'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='617'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='is_removed' type-id='type-id-513'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='618'
> column='1'/>
> +        <var-decl name='is_removed' type-id='type-id-511'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='618'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='promiscuous_enable' type-id='type-id-514'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='621'
> column='1'/>
> +        <var-decl name='promiscuous_enable' type-id='type-id-512'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='621'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='promiscuous_disable' type-id='type-id-515'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='622'
> column='1'/>
> +        <var-decl name='promiscuous_disable' type-id='type-id-513'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='622'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='allmulticast_enable' type-id='type-id-516'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='623'
> column='1'/>
> +        <var-decl name='allmulticast_enable' type-id='type-id-514'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='623'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='allmulticast_disable' type-id='type-id-517'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='624'
> column='1'/>
> +        <var-decl name='allmulticast_disable' type-id='type-id-515'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='624'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
> -        <var-decl name='mac_addr_remove' type-id='type-id-518'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='625'
> column='1'/>
> +        <var-decl name='mac_addr_remove' type-id='type-id-516'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='625'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='mac_addr_add' type-id='type-id-519'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='626'
> column='1'/>
> +        <var-decl name='mac_addr_add' type-id='type-id-517'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='626'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
> -        <var-decl name='mac_addr_set' type-id='type-id-520'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='627'
> column='1'/>
> +        <var-decl name='mac_addr_set' type-id='type-id-518'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='627'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
> -        <var-decl name='set_mc_addr_list' type-id='type-id-521'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='628'
> column='1'/>
> +        <var-decl name='set_mc_addr_list' type-id='type-id-519'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='628'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
> -        <var-decl name='mtu_set' type-id='type-id-522'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='629'
> column='1'/>
> +        <var-decl name='mtu_set' type-id='type-id-520'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='629'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
> -        <var-decl name='stats_get' type-id='type-id-523'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='631'
> column='1'/>
> +        <var-decl name='stats_get' type-id='type-id-521'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='631'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1216'>
> -        <var-decl name='stats_reset' type-id='type-id-524'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='632'
> column='1'/>
> +        <var-decl name='stats_reset' type-id='type-id-522'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='632'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1280'>
> -        <var-decl name='xstats_get' type-id='type-id-525'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='633'
> column='1'/>
> +        <var-decl name='xstats_get' type-id='type-id-523'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='633'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1344'>
> -        <var-decl name='xstats_reset' type-id='type-id-526'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='634'
> column='1'/>
> +        <var-decl name='xstats_reset' type-id='type-id-524'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='634'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1408'>
> -        <var-decl name='xstats_get_names' type-id='type-id-527'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='635'
> column='1'/>
> +        <var-decl name='xstats_get_names' type-id='type-id-525'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='635'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1472'>
> -        <var-decl name='queue_stats_mapping_set' type-id='type-id-528'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='637'
> column='1'/>
> +        <var-decl name='queue_stats_mapping_set' type-id='type-id-526'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='637'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1536'>
> -        <var-decl name='dev_infos_get' type-id='type-id-529'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='640'
> column='1'/>
> +        <var-decl name='dev_infos_get' type-id='type-id-527'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='640'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1600'>
> -        <var-decl name='rxq_info_get' type-id='type-id-530'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='641'
> column='1'/>
> +        <var-decl name='rxq_info_get' type-id='type-id-528'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='641'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1664'>
> -        <var-decl name='txq_info_get' type-id='type-id-531'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='642'
> column='1'/>
> +        <var-decl name='txq_info_get' type-id='type-id-529'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='642'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1728'>
> -        <var-decl name='rx_burst_mode_get' type-id='type-id-532'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='643'
> column='1'/>
> +        <var-decl name='rx_burst_mode_get' type-id='type-id-530'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='643'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1792'>
> -        <var-decl name='tx_burst_mode_get' type-id='type-id-532'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='644'
> column='1'/>
> +        <var-decl name='tx_burst_mode_get' type-id='type-id-530'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='644'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1856'>
> -        <var-decl name='fw_version_get' type-id='type-id-533'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='645'
> column='1'/>
> +        <var-decl name='fw_version_get' type-id='type-id-531'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='645'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1920'>
> -        <var-decl name='dev_supported_ptypes_get' type-id='type-id-534'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='646'
> column='1'/>
> +        <var-decl name='dev_supported_ptypes_get' type-id='type-id-532'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='646'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1984'>
> -        <var-decl name='dev_ptypes_set' type-id='type-id-535'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='648'
> column='1'/>
> +        <var-decl name='dev_ptypes_set' type-id='type-id-533'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='648'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2048'>
> -        <var-decl name='vlan_filter_set' type-id='type-id-536'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='651'
> column='1'/>
> +        <var-decl name='vlan_filter_set' type-id='type-id-534'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='651'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2112'>
> -        <var-decl name='vlan_tpid_set' type-id='type-id-537'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='652'
> column='1'/>
> +        <var-decl name='vlan_tpid_set' type-id='type-id-535'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='652'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2176'>
> -        <var-decl name='vlan_strip_queue_set' type-id='type-id-538'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='653'
> column='1'/>
> +        <var-decl name='vlan_strip_queue_set' type-id='type-id-536'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='653'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2240'>
> -        <var-decl name='vlan_offload_set' type-id='type-id-539'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='654'
> column='1'/>
> +        <var-decl name='vlan_offload_set' type-id='type-id-537'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='654'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2304'>
> -        <var-decl name='vlan_pvid_set' type-id='type-id-540'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='655'
> column='1'/>
> +        <var-decl name='vlan_pvid_set' type-id='type-id-538'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='655'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2368'>
> -        <var-decl name='rx_queue_start' type-id='type-id-541'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='657'
> column='1'/>
> +        <var-decl name='rx_queue_start' type-id='type-id-539'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='657'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2432'>
> -        <var-decl name='rx_queue_stop' type-id='type-id-542'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='658'
> column='1'/>
> +        <var-decl name='rx_queue_stop' type-id='type-id-540'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='658'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2496'>
> -        <var-decl name='tx_queue_start' type-id='type-id-541'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='659'
> column='1'/>
> +        <var-decl name='tx_queue_start' type-id='type-id-539'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='659'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2560'>
> -        <var-decl name='tx_queue_stop' type-id='type-id-542'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='660'
> column='1'/>
> +        <var-decl name='tx_queue_stop' type-id='type-id-540'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='660'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2624'>
> -        <var-decl name='rx_queue_setup' type-id='type-id-543'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='661'
> column='1'/>
> +        <var-decl name='rx_queue_setup' type-id='type-id-541'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='661'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2688'>
> -        <var-decl name='rx_queue_release' type-id='type-id-544'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='662'
> column='1'/>
> +        <var-decl name='rx_queue_release' type-id='type-id-542'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='662'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2752'>
> -        <var-decl name='rx_queue_count' type-id='type-id-545'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='663'
> column='1'/>
> +        <var-decl name='rx_queue_count' type-id='type-id-543'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='663'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2816'>
> -        <var-decl name='rx_descriptor_done' type-id='type-id-546'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='665'
> column='1'/>
> +        <var-decl name='rx_descriptor_done' type-id='type-id-544'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='665'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2880'>
> -        <var-decl name='rx_descriptor_status' type-id='type-id-547'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='666'
> column='1'/>
> +        <var-decl name='rx_descriptor_status' type-id='type-id-545'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='666'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2944'>
> -        <var-decl name='tx_descriptor_status' type-id='type-id-548'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='668'
> column='1'/>
> +        <var-decl name='tx_descriptor_status' type-id='type-id-546'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='668'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3008'>
> -        <var-decl name='rx_queue_intr_enable' type-id='type-id-549'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='670'
> column='1'/>
> +        <var-decl name='rx_queue_intr_enable' type-id='type-id-547'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='670'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3072'>
> -        <var-decl name='rx_queue_intr_disable' type-id='type-id-550'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='671'
> column='1'/>
> +        <var-decl name='rx_queue_intr_disable' type-id='type-id-548'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='671'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3136'>
> -        <var-decl name='tx_queue_setup' type-id='type-id-551'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='672'
> column='1'/>
> +        <var-decl name='tx_queue_setup' type-id='type-id-549'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='672'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3200'>
> -        <var-decl name='tx_queue_release' type-id='type-id-544'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='673'
> column='1'/>
> +        <var-decl name='tx_queue_release' type-id='type-id-542'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='673'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3264'>
> -        <var-decl name='tx_done_cleanup' type-id='type-id-552'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='674'
> column='1'/>
> +        <var-decl name='tx_done_cleanup' type-id='type-id-550'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='674'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3328'>
> -        <var-decl name='dev_led_on' type-id='type-id-553'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='676'
> column='1'/>
> +        <var-decl name='dev_led_on' type-id='type-id-551'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='676'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3392'>
> -        <var-decl name='dev_led_off' type-id='type-id-554'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='677'
> column='1'/>
> +        <var-decl name='dev_led_off' type-id='type-id-552'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='677'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3456'>
> -        <var-decl name='flow_ctrl_get' type-id='type-id-555'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='679'
> column='1'/>
> +        <var-decl name='flow_ctrl_get' type-id='type-id-553'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='679'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3520'>
> -        <var-decl name='flow_ctrl_set' type-id='type-id-556'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='680'
> column='1'/>
> +        <var-decl name='flow_ctrl_set' type-id='type-id-554'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='680'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3584'>
> -        <var-decl name='priority_flow_ctrl_set' type-id='type-id-557'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='681'
> column='1'/>
> +        <var-decl name='priority_flow_ctrl_set' type-id='type-id-555'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='681'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3648'>
> -        <var-decl name='uc_hash_table_set' type-id='type-id-558'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='683'
> column='1'/>
> +        <var-decl name='uc_hash_table_set' type-id='type-id-556'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='683'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3712'>
> -        <var-decl name='uc_all_hash_table_set' type-id='type-id-559'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='684'
> column='1'/>
> +        <var-decl name='uc_all_hash_table_set' type-id='type-id-557'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='684'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3776'>
> -        <var-decl name='mirror_rule_set' type-id='type-id-560'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='686'
> column='1'/>
> +        <var-decl name='mirror_rule_set' type-id='type-id-558'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='686'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3840'>
> -        <var-decl name='mirror_rule_reset' type-id='type-id-561'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='687'
> column='1'/>
> +        <var-decl name='mirror_rule_reset' type-id='type-id-559'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='687'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3904'>
> -        <var-decl name='udp_tunnel_port_add' type-id='type-id-562'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='689'
> column='1'/>
> +        <var-decl name='udp_tunnel_port_add' type-id='type-id-560'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='689'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3968'>
> -        <var-decl name='udp_tunnel_port_del' type-id='type-id-563'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='690'
> column='1'/>
> +        <var-decl name='udp_tunnel_port_del' type-id='type-id-561'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='690'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4032'>
> -        <var-decl name='l2_tunnel_eth_type_conf' type-id='type-id-564'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='691'
> column='1'/>
> +        <var-decl name='l2_tunnel_eth_type_conf' type-id='type-id-562'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='691'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4096'>
> -        <var-decl name='l2_tunnel_offload_set' type-id='type-id-565'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='693'
> column='1'/>
> +        <var-decl name='l2_tunnel_offload_set' type-id='type-id-563'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='693'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4160'>
> -        <var-decl name='set_queue_rate_limit' type-id='type-id-566'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='696'
> column='1'/>
> +        <var-decl name='set_queue_rate_limit' type-id='type-id-564'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='696'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4224'>
> -        <var-decl name='rss_hash_update' type-id='type-id-567'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='698'
> column='1'/>
> +        <var-decl name='rss_hash_update' type-id='type-id-565'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='698'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4288'>
> -        <var-decl name='rss_hash_conf_get' type-id='type-id-568'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='699'
> column='1'/>
> +        <var-decl name='rss_hash_conf_get' type-id='type-id-566'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='699'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4352'>
> -        <var-decl name='reta_update' type-id='type-id-569'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='700'
> column='1'/>
> +        <var-decl name='reta_update' type-id='type-id-567'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='700'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4416'>
> -        <var-decl name='reta_query' type-id='type-id-570'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='701'
> column='1'/>
> +        <var-decl name='reta_query' type-id='type-id-568'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='701'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4480'>
> -        <var-decl name='get_reg' type-id='type-id-571'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='703'
> column='1'/>
> +        <var-decl name='get_reg' type-id='type-id-569'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='703'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4544'>
> -        <var-decl name='get_eeprom_length' type-id='type-id-572'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='704'
> column='1'/>
> +        <var-decl name='get_eeprom_length' type-id='type-id-570'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='704'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4608'>
> -        <var-decl name='get_eeprom' type-id='type-id-573'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='705'
> column='1'/>
> +        <var-decl name='get_eeprom' type-id='type-id-571'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='705'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4672'>
> -        <var-decl name='set_eeprom' type-id='type-id-574'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='706'
> column='1'/>
> +        <var-decl name='set_eeprom' type-id='type-id-572'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='706'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4736'>
> -        <var-decl name='get_module_info' type-id='type-id-575'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='708'
> column='1'/>
> +        <var-decl name='get_module_info' type-id='type-id-573'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='708'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4800'>
> -        <var-decl name='get_module_eeprom' type-id='type-id-576'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='710'
> column='1'/>
> +        <var-decl name='get_module_eeprom' type-id='type-id-574'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='710'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4864'>
> -        <var-decl name='filter_ctrl' type-id='type-id-577'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='713'
> column='1'/>
> +        <var-decl name='filter_ctrl' type-id='type-id-575'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='713'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4928'>
> -        <var-decl name='get_dcb_info' type-id='type-id-578'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='715'
> column='1'/>
> +        <var-decl name='get_dcb_info' type-id='type-id-576'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='715'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4992'>
> -        <var-decl name='timesync_enable' type-id='type-id-579'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='717'
> column='1'/>
> +        <var-decl name='timesync_enable' type-id='type-id-577'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='717'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5056'>
> -        <var-decl name='timesync_disable' type-id='type-id-580'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='719'
> column='1'/>
> +        <var-decl name='timesync_disable' type-id='type-id-578'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='719'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5120'>
> -        <var-decl name='timesync_read_rx_timestamp' type-id='type-id-581'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='721'
> column='1'/>
> +        <var-decl name='timesync_read_rx_timestamp' type-id='type-id-579'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='721'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5184'>
> -        <var-decl name='timesync_read_tx_timestamp' type-id='type-id-582'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='723'
> column='1'/>
> +        <var-decl name='timesync_read_tx_timestamp' type-id='type-id-580'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='723'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5248'>
> -        <var-decl name='timesync_adjust_time' type-id='type-id-583'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='725'
> column='1'/>
> +        <var-decl name='timesync_adjust_time' type-id='type-id-581'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='725'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5312'>
> -        <var-decl name='timesync_read_time' type-id='type-id-584'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='726'
> column='1'/>
> +        <var-decl name='timesync_read_time' type-id='type-id-582'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='726'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5376'>
> -        <var-decl name='timesync_write_time' type-id='type-id-585'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='727'
> column='1'/>
> +        <var-decl name='timesync_write_time' type-id='type-id-583'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='727'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5440'>
> -        <var-decl name='read_clock' type-id='type-id-586'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='729'
> column='1'/>
> +        <var-decl name='read_clock' type-id='type-id-584'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='729'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5504'>
> -        <var-decl name='xstats_get_by_id' type-id='type-id-587'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='731'
> column='1'/>
> +        <var-decl name='xstats_get_by_id' type-id='type-id-585'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='731'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5568'>
> -        <var-decl name='xstats_get_names_by_id' type-id='type-id-588'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='733'
> column='1'/>
> +        <var-decl name='xstats_get_names_by_id' type-id='type-id-586'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='733'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5632'>
> -        <var-decl name='tm_ops_get' type-id='type-id-589'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='736'
> column='1'/>
> +        <var-decl name='tm_ops_get' type-id='type-id-587'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='736'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5696'>
> -        <var-decl name='mtr_ops_get' type-id='type-id-590'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='739'
> column='1'/>
> +        <var-decl name='mtr_ops_get' type-id='type-id-588'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='739'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5760'>
> -        <var-decl name='pool_ops_supported' type-id='type-id-591'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='742'
> column='1'/>
> +        <var-decl name='pool_ops_supported' type-id='type-id-589'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='742'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5824'>
> -        <var-decl name='hairpin_cap_get' type-id='type-id-592'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='745'
> column='1'/>
> +        <var-decl name='hairpin_cap_get' type-id='type-id-590'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='745'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5888'>
> -        <var-decl name='rx_hairpin_queue_setup' type-id='type-id-593'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='747'
> column='1'/>
> +        <var-decl name='rx_hairpin_queue_setup' type-id='type-id-591'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='747'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5952'>
> -        <var-decl name='tx_hairpin_queue_setup' type-id='type-id-594'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='749'
> column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <typedef-decl name='eth_dev_configure_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='31'
> column='1' id='type-id-505'/>
> -    <typedef-decl name='eth_dev_start_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='34'
> column='1' id='type-id-506'/>
> -    <typedef-decl name='eth_dev_stop_t' type-id='type-id-596'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='37'
> column='1' id='type-id-507'/>
> -    <typedef-decl name='eth_dev_set_link_up_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='40'
> column='1' id='type-id-508'/>
> -    <typedef-decl name='eth_dev_set_link_down_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='43'
> column='1' id='type-id-509'/>
> -    <typedef-decl name='eth_dev_close_t' type-id='type-id-596'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='46'
> column='1' id='type-id-510'/>
> -    <typedef-decl name='eth_dev_reset_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='49'
> column='1' id='type-id-511'/>
> -    <typedef-decl name='eth_link_update_t' type-id='type-id-597'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='155'
> column='1' id='type-id-512'/>
> -    <typedef-decl name='eth_is_removed_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='52'
> column='1' id='type-id-513'/>
> -    <typedef-decl name='eth_promiscuous_enable_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='78'
> column='1' id='type-id-514'/>
> -    <typedef-decl name='eth_promiscuous_disable_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='103'
> column='1' id='type-id-515'/>
> -    <typedef-decl name='eth_allmulticast_enable_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='128'
> column='1' id='type-id-516'/>
> -    <typedef-decl name='eth_allmulticast_disable_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='153'
> column='1' id='type-id-517'/>
> -    <typedef-decl name='eth_mac_addr_remove_t' type-id='type-id-598'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='391'
> column='1' id='type-id-518'/>
> -    <typedef-decl name='eth_mac_addr_add_t' type-id='type-id-599'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='394'
> column='1' id='type-id-519'/>
> -    <typedef-decl name='eth_mac_addr_set_t' type-id='type-id-600'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='400'
> column='1' id='type-id-520'/>
> -    <typedef-decl name='eth_set_mc_addr_list_t' type-id='type-id-601'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='436'
> column='1' id='type-id-521'/>
> -    <typedef-decl name='mtu_set_t' type-id='type-id-602'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='315'
> column='1' id='type-id-522'/>
> -    <typedef-decl name='eth_stats_get_t' type-id='type-id-603'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='159'
> column='1' id='type-id-523'/>
> -    <typedef-decl name='eth_stats_reset_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='182'
> column='1' id='type-id-524'/>
> -    <typedef-decl name='eth_xstats_get_t' type-id='type-id-604'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='184'
> column='1' id='type-id-525'/>
> -    <class-decl name='rte_eth_xstat' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1337' column='1' id='type-id-605'>
> +        <var-decl name='tx_hairpin_queue_setup' type-id='type-id-592'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='749'
> column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <typedef-decl name='eth_dev_configure_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='31'
> column='1' id='type-id-503'/>
> +    <typedef-decl name='eth_dev_start_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='34'
> column='1' id='type-id-504'/>
> +    <typedef-decl name='eth_dev_stop_t' type-id='type-id-594'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='37'
> column='1' id='type-id-505'/>
> +    <typedef-decl name='eth_dev_set_link_up_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='40'
> column='1' id='type-id-506'/>
> +    <typedef-decl name='eth_dev_set_link_down_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='43'
> column='1' id='type-id-507'/>
> +    <typedef-decl name='eth_dev_close_t' type-id='type-id-594'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='46'
> column='1' id='type-id-508'/>
> +    <typedef-decl name='eth_dev_reset_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='49'
> column='1' id='type-id-509'/>
> +    <typedef-decl name='eth_link_update_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='155'
> column='1' id='type-id-510'/>
> +    <typedef-decl name='eth_is_removed_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='52'
> column='1' id='type-id-511'/>
> +    <typedef-decl name='eth_promiscuous_enable_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='78'
> column='1' id='type-id-512'/>
> +    <typedef-decl name='eth_promiscuous_disable_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='103'
> column='1' id='type-id-513'/>
> +    <typedef-decl name='eth_allmulticast_enable_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='128'
> column='1' id='type-id-514'/>
> +    <typedef-decl name='eth_allmulticast_disable_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='153'
> column='1' id='type-id-515'/>
> +    <typedef-decl name='eth_mac_addr_remove_t' type-id='type-id-596'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='391'
> column='1' id='type-id-516'/>
> +    <typedef-decl name='eth_mac_addr_add_t' type-id='type-id-597'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='394'
> column='1' id='type-id-517'/>
> +    <typedef-decl name='eth_mac_addr_set_t' type-id='type-id-598'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='400'
> column='1' id='type-id-518'/>
> +    <typedef-decl name='eth_set_mc_addr_list_t' type-id='type-id-599'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='436'
> column='1' id='type-id-519'/>
> +    <typedef-decl name='mtu_set_t' type-id='type-id-600'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='315'
> column='1' id='type-id-520'/>
> +    <typedef-decl name='eth_stats_get_t' type-id='type-id-601'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='159'
> column='1' id='type-id-521'/>
> +    <typedef-decl name='eth_stats_reset_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='182'
> column='1' id='type-id-522'/>
> +    <typedef-decl name='eth_xstats_get_t' type-id='type-id-602'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='184'
> column='1' id='type-id-523'/>
> +    <class-decl name='rte_eth_xstat' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1337' column='1' id='type-id-603'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='id' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1338'
> column='1'/>
>        </data-member>
> @@ -4338,21 +4335,21 @@
>          <var-decl name='value' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1339'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_xstats_reset_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='213'
> column='1' id='type-id-526'/>
> -    <typedef-decl name='eth_xstats_get_names_t' type-id='type-id-606'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='215'
> column='1' id='type-id-527'/>
> -    <class-decl name='rte_eth_xstat_name' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1349' column='1'
> id='type-id-607'>
> +    <typedef-decl name='eth_xstats_reset_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='213'
> column='1' id='type-id-524'/>
> +    <typedef-decl name='eth_xstats_get_names_t' type-id='type-id-604'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='215'
> column='1' id='type-id-525'/>
> +    <class-decl name='rte_eth_xstat_name' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1349' column='1'
> id='type-id-605'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='name' type-id='type-id-360' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1350'
> column='1'/>
> +        <var-decl name='name' type-id='type-id-358' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1350'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_queue_stats_mapping_set_t'
> type-id='type-id-608'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='224'
> column='1' id='type-id-528'/>
> -    <typedef-decl name='eth_dev_infos_get_t' type-id='type-id-609'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='230'
> column='1' id='type-id-529'/>
> -    <class-decl name='rte_eth_dev_info' size-in-bits='2560'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1226' column='1'
> id='type-id-610'>
> +    <typedef-decl name='eth_queue_stats_mapping_set_t'
> type-id='type-id-606'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='224'
> column='1' id='type-id-526'/>
> +    <typedef-decl name='eth_dev_infos_get_t' type-id='type-id-607'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='230'
> column='1' id='type-id-527'/>
> +    <class-decl name='rte_eth_dev_info' size-in-bits='2560'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1226' column='1'
> id='type-id-608'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='device' type-id='type-id-431'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1227' column='1'/>
> +        <var-decl name='device' type-id='type-id-429'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1227' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='driver_name' type-id='type-id-401'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1228' column='1'/>
> +        <var-decl name='driver_name' type-id='type-id-399'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1228' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='if_index' type-id='type-id-2'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1229' column='1'/>
> @@ -4364,7 +4361,7 @@
>          <var-decl name='max_mtu' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1232'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='dev_flags' type-id='type-id-611'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1233' column='1'/>
> +        <var-decl name='dev_flags' type-id='type-id-609'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1233' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <var-decl name='min_rx_bufsize' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1234' column='1'/>
> @@ -4415,10 +4412,10 @@
>          <var-decl name='flow_type_rss_offloads' type-id='type-id-11'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1257' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='default_rxconf' type-id='type-id-612'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1258' column='1'/>
> +        <var-decl name='default_rxconf' type-id='type-id-610'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1258' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1280'>
> -        <var-decl name='default_txconf' type-id='type-id-613'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1259' column='1'/>
> +        <var-decl name='default_txconf' type-id='type-id-611'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1259' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1728'>
>          <var-decl name='vmdq_queue_base' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1260' column='1'/>
> @@ -4430,10 +4427,10 @@
>          <var-decl name='vmdq_pool_base' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1262' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1776'>
> -        <var-decl name='rx_desc_lim' type-id='type-id-614'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1263' column='1'/>
> +        <var-decl name='rx_desc_lim' type-id='type-id-612'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1263' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1856'>
> -        <var-decl name='tx_desc_lim' type-id='type-id-614'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1264' column='1'/>
> +        <var-decl name='tx_desc_lim' type-id='type-id-612'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1264' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1952'>
>          <var-decl name='speed_capa' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1265' column='1'/>
> @@ -4445,16 +4442,16 @@
>          <var-decl name='nb_tx_queues' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1268' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2016'>
> -        <var-decl name='default_rxportconf' type-id='type-id-615'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1270' column='1'/>
> +        <var-decl name='default_rxportconf' type-id='type-id-613'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1270' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2064'>
> -        <var-decl name='default_txportconf' type-id='type-id-615'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1272' column='1'/>
> +        <var-decl name='default_txportconf' type-id='type-id-613'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1272' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2112'>
>          <var-decl name='dev_capa' type-id='type-id-11'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1274' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2176'>
> -        <var-decl name='switch_info' type-id='type-id-616'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1279' column='1'/>
> +        <var-decl name='switch_info' type-id='type-id-614'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1279' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2304'>
>          <var-decl name='reserved_64s' type-id='type-id-138'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1281' column='1'/>
> @@ -4463,9 +4460,9 @@
>          <var-decl name='reserved_ptrs' type-id='type-id-60'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1282' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_rxconf' size-in-bits='384' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='818' column='1' id='type-id-612'>
> +    <class-decl name='rte_eth_rxconf' size-in-bits='384' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='818' column='1' id='type-id-610'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='rx_thresh' type-id='type-id-617'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='819' column='1'/>
> +        <var-decl name='rx_thresh' type-id='type-id-615'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='819' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='rx_free_thresh' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='820' column='1'/>
> @@ -4486,7 +4483,7 @@
>          <var-decl name='reserved_ptrs' type-id='type-id-60'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='831' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_thresh' size-in-bits='24' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='327' column='1' id='type-id-617'>
> +    <class-decl name='rte_eth_thresh' size-in-bits='24' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='327' column='1' id='type-id-615'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='pthresh' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='328' column='1'/>
>        </data-member>
> @@ -4497,9 +4494,9 @@
>          <var-decl name='wthresh' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='330' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_txconf' size-in-bits='448' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='837' column='1' id='type-id-613'>
> +    <class-decl name='rte_eth_txconf' size-in-bits='448' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='837' column='1' id='type-id-611'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tx_thresh' type-id='type-id-617'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='838' column='1'/>
> +        <var-decl name='tx_thresh' type-id='type-id-615'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='838' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='tx_rs_thresh' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='839' column='1'/>
> @@ -4520,7 +4517,7 @@
>          <var-decl name='reserved_ptrs' type-id='type-id-60'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='852' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_desc_lim' size-in-bits='80' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='898' column='1' id='type-id-614'>
> +    <class-decl name='rte_eth_desc_lim' size-in-bits='80' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='898' column='1' id='type-id-612'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='nb_max' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='899' column='1'/>
>        </data-member>
> @@ -4537,7 +4534,7 @@
>          <var-decl name='nb_mtu_seg_max' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='924' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_dev_portconf' size-in-bits='48'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1189' column='1'
> id='type-id-615'>
> +    <class-decl name='rte_eth_dev_portconf' size-in-bits='48'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1189' column='1'
> id='type-id-613'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='burst_size' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1190' column='1'/>
>        </data-member>
> @@ -4548,9 +4545,9 @@
>          <var-decl name='nb_queues' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1192' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_switch_info' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1204' column='1'
> id='type-id-616'>
> +    <class-decl name='rte_eth_switch_info' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1204' column='1'
> id='type-id-614'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='name' type-id='type-id-401' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1205'
> column='1'/>
> +        <var-decl name='name' type-id='type-id-399' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1205'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='domain_id' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1206' column='1'/>
> @@ -4559,13 +4556,13 @@
>          <var-decl name='port_id' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1207'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_rxq_info_get_t' type-id='type-id-618'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='306'
> column='1' id='type-id-530'/>
> -    <class-decl name='rte_eth_rxq_info' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1289' column='1'
> id='type-id-619'>
> +    <typedef-decl name='eth_rxq_info_get_t' type-id='type-id-616'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='306'
> column='1' id='type-id-528'/>
> +    <class-decl name='rte_eth_rxq_info' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1289' column='1'
> id='type-id-617'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='mp' type-id='type-id-265' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1290'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='conf' type-id='type-id-612' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1291'
> column='1'/>
> +        <var-decl name='conf' type-id='type-id-610' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1291'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <var-decl name='scattered_rx' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1292' column='1'/>
> @@ -4574,55 +4571,55 @@
>          <var-decl name='nb_desc' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1293'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_txq_info_get_t' type-id='type-id-620'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='309'
> column='1' id='type-id-531'/>
> -    <class-decl name='rte_eth_txq_info' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1300' column='1'
> id='type-id-621'>
> +    <typedef-decl name='eth_txq_info_get_t' type-id='type-id-618'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='309'
> column='1' id='type-id-529'/>
> +    <class-decl name='rte_eth_txq_info' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1300' column='1'
> id='type-id-619'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='conf' type-id='type-id-613' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1301'
> column='1'/>
> +        <var-decl name='conf' type-id='type-id-611' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1301'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <var-decl name='nb_desc' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1302'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_burst_mode_get_t' type-id='type-id-622'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='312'
> column='1' id='type-id-532'/>
> -    <class-decl name='rte_eth_burst_mode' size-in-bits='8256'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1318' column='1'
> id='type-id-623'>
> +    <typedef-decl name='eth_burst_mode_get_t' type-id='type-id-620'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='312'
> column='1' id='type-id-530'/>
> +    <class-decl name='rte_eth_burst_mode' size-in-bits='8256'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1318' column='1'
> id='type-id-621'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='flags' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1319'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='info' type-id='type-id-358' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1322'
> column='1'/>
> +        <var-decl name='info' type-id='type-id-356' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1322'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_fw_version_get_t' type-id='type-id-624'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='299'
> column='1' id='type-id-533'/>
> -    <typedef-decl name='eth_dev_supported_ptypes_get_t'
> type-id='type-id-625'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='234'
> column='1' id='type-id-534'/>
> -    <typedef-decl name='eth_dev_ptypes_set_t' type-id='type-id-626'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='249'
> column='1' id='type-id-535'/>
> -    <typedef-decl name='vlan_filter_set_t' type-id='type-id-627'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='318'
> column='1' id='type-id-536'/>
> -    <typedef-decl name='vlan_tpid_set_t' type-id='type-id-628'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='323'
> column='1' id='type-id-537'/>
> -    <enum-decl name='rte_vlan_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='416' column='1'
> id='type-id-629'>
> +    <typedef-decl name='eth_fw_version_get_t' type-id='type-id-622'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='299'
> column='1' id='type-id-531'/>
> +    <typedef-decl name='eth_dev_supported_ptypes_get_t'
> type-id='type-id-623'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='234'
> column='1' id='type-id-532'/>
> +    <typedef-decl name='eth_dev_ptypes_set_t' type-id='type-id-624'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='249'
> column='1' id='type-id-533'/>
> +    <typedef-decl name='vlan_filter_set_t' type-id='type-id-625'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='318'
> column='1' id='type-id-534'/>
> +    <typedef-decl name='vlan_tpid_set_t' type-id='type-id-626'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='323'
> column='1' id='type-id-535'/>
> +    <enum-decl name='rte_vlan_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='416' column='1'
> id='type-id-627'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='ETH_VLAN_TYPE_UNKNOWN' value='0'/>
>        <enumerator name='ETH_VLAN_TYPE_INNER' value='1'/>
>        <enumerator name='ETH_VLAN_TYPE_OUTER' value='2'/>
>        <enumerator name='ETH_VLAN_TYPE_MAX' value='3'/>
>      </enum-decl>
> -    <typedef-decl name='vlan_strip_queue_set_t' type-id='type-id-630'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='335'
> column='1' id='type-id-538'/>
> -    <typedef-decl name='vlan_offload_set_t' type-id='type-id-597'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='327'
> column='1' id='type-id-539'/>
> -    <typedef-decl name='vlan_pvid_set_t' type-id='type-id-627'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='330'
> column='1' id='type-id-540'/>
> -    <typedef-decl name='eth_queue_start_t' type-id='type-id-602'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='252'
> column='1' id='type-id-541'/>
> -    <typedef-decl name='eth_queue_stop_t' type-id='type-id-602'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='256'
> column='1' id='type-id-542'/>
> -    <typedef-decl name='eth_rx_queue_setup_t' type-id='type-id-631'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='260'
> column='1' id='type-id-543'/>
> -    <typedef-decl name='eth_queue_release_t' type-id='type-id-632'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='283'
> column='1' id='type-id-544'/>
> -    <typedef-decl name='eth_rx_queue_count_t' type-id='type-id-633'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='286'
> column='1' id='type-id-545'/>
> -    <typedef-decl name='eth_rx_descriptor_done_t' type-id='type-id-634'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='290'
> column='1' id='type-id-546'/>
> -    <typedef-decl name='eth_rx_descriptor_status_t' type-id='type-id-634'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='293'
> column='1' id='type-id-547'/>
> -    <typedef-decl name='eth_tx_descriptor_status_t' type-id='type-id-634'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='296'
> column='1' id='type-id-548'/>
> -    <typedef-decl name='eth_rx_enable_intr_t' type-id='type-id-602'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='275'
> column='1' id='type-id-549'/>
> -    <typedef-decl name='eth_rx_disable_intr_t' type-id='type-id-602'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='279'
> column='1' id='type-id-550'/>
> -    <typedef-decl name='eth_tx_queue_setup_t' type-id='type-id-635'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='268'
> column='1' id='type-id-551'/>
> -    <typedef-decl name='eth_tx_done_cleanup_t' type-id='type-id-636'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='303'
> column='1' id='type-id-552'/>
> -    <typedef-decl name='eth_dev_led_on_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='385'
> column='1' id='type-id-553'/>
> -    <typedef-decl name='eth_dev_led_off_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='388'
> column='1' id='type-id-554'/>
> -    <typedef-decl name='flow_ctrl_get_t' type-id='type-id-637'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='355'
> column='1' id='type-id-555'/>
> -    <class-decl name='rte_eth_fc_conf' size-in-bits='160' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='942' column='1' id='type-id-638'>
> +    <typedef-decl name='vlan_strip_queue_set_t' type-id='type-id-628'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='335'
> column='1' id='type-id-536'/>
> +    <typedef-decl name='vlan_offload_set_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='327'
> column='1' id='type-id-537'/>
> +    <typedef-decl name='vlan_pvid_set_t' type-id='type-id-625'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='330'
> column='1' id='type-id-538'/>
> +    <typedef-decl name='eth_queue_start_t' type-id='type-id-600'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='252'
> column='1' id='type-id-539'/>
> +    <typedef-decl name='eth_queue_stop_t' type-id='type-id-600'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='256'
> column='1' id='type-id-540'/>
> +    <typedef-decl name='eth_rx_queue_setup_t' type-id='type-id-629'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='260'
> column='1' id='type-id-541'/>
> +    <typedef-decl name='eth_queue_release_t' type-id='type-id-630'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='283'
> column='1' id='type-id-542'/>
> +    <typedef-decl name='eth_rx_queue_count_t' type-id='type-id-631'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='286'
> column='1' id='type-id-543'/>
> +    <typedef-decl name='eth_rx_descriptor_done_t' type-id='type-id-632'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='290'
> column='1' id='type-id-544'/>
> +    <typedef-decl name='eth_rx_descriptor_status_t' type-id='type-id-632'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='293'
> column='1' id='type-id-545'/>
> +    <typedef-decl name='eth_tx_descriptor_status_t' type-id='type-id-632'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='296'
> column='1' id='type-id-546'/>
> +    <typedef-decl name='eth_rx_enable_intr_t' type-id='type-id-600'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='275'
> column='1' id='type-id-547'/>
> +    <typedef-decl name='eth_rx_disable_intr_t' type-id='type-id-600'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='279'
> column='1' id='type-id-548'/>
> +    <typedef-decl name='eth_tx_queue_setup_t' type-id='type-id-633'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='268'
> column='1' id='type-id-549'/>
> +    <typedef-decl name='eth_tx_done_cleanup_t' type-id='type-id-634'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='303'
> column='1' id='type-id-550'/>
> +    <typedef-decl name='eth_dev_led_on_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='385'
> column='1' id='type-id-551'/>
> +    <typedef-decl name='eth_dev_led_off_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='388'
> column='1' id='type-id-552'/>
> +    <typedef-decl name='flow_ctrl_get_t' type-id='type-id-635'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='355'
> column='1' id='type-id-553'/>
> +    <class-decl name='rte_eth_fc_conf' size-in-bits='160' is-struct='yes'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='942' column='1' id='type-id-636'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='high_water' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='943' column='1'/>
>        </data-member>
> @@ -4636,7 +4633,7 @@
>          <var-decl name='send_xon' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='946' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='mode' type-id='type-id-639' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='947' column='1'/>
> +        <var-decl name='mode' type-id='type-id-637' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='947' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='mac_ctrl_frame_fwd' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='948' column='1'/>
> @@ -4645,27 +4642,27 @@
>          <var-decl name='autoneg' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='949' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_eth_fc_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='930' column='1'
> id='type-id-639'>
> +    <enum-decl name='rte_eth_fc_mode'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='930' column='1'
> id='type-id-637'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_FC_NONE' value='0'/>
>        <enumerator name='RTE_FC_RX_PAUSE' value='1'/>
>        <enumerator name='RTE_FC_TX_PAUSE' value='2'/>
>        <enumerator name='RTE_FC_FULL' value='3'/>
>      </enum-decl>
> -    <typedef-decl name='flow_ctrl_set_t' type-id='type-id-637'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='359'
> column='1' id='type-id-556'/>
> -    <typedef-decl name='priority_flow_ctrl_set_t' type-id='type-id-640'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='363'
> column='1' id='type-id-557'/>
> -    <class-decl name='rte_eth_pfc_conf' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='957' column='1'
> id='type-id-641'>
> +    <typedef-decl name='flow_ctrl_set_t' type-id='type-id-635'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='359'
> column='1' id='type-id-554'/>
> +    <typedef-decl name='priority_flow_ctrl_set_t' type-id='type-id-638'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='363'
> column='1' id='type-id-555'/>
> +    <class-decl name='rte_eth_pfc_conf' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='957' column='1'
> id='type-id-639'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='fc' type-id='type-id-638' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='958' column='1'/>
> +        <var-decl name='fc' type-id='type-id-636' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='958' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='160'>
>          <var-decl name='priority' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='959' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_uc_hash_table_set_t' type-id='type-id-642'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='404'
> column='1' id='type-id-558'/>
> -    <typedef-decl name='eth_uc_all_hash_table_set_t'
> type-id='type-id-643'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='409'
> column='1' id='type-id-559'/>
> -    <typedef-decl name='eth_mirror_rule_set_t' type-id='type-id-644'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='418'
> column='1' id='type-id-560'/>
> -    <class-decl name='rte_eth_mirror_conf' size-in-bits='1216'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='670' column='1'
> id='type-id-645'>
> +    <typedef-decl name='eth_uc_hash_table_set_t' type-id='type-id-640'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='404'
> column='1' id='type-id-556'/>
> +    <typedef-decl name='eth_uc_all_hash_table_set_t'
> type-id='type-id-641'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='409'
> column='1' id='type-id-557'/>
> +    <typedef-decl name='eth_mirror_rule_set_t' type-id='type-id-642'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='418'
> column='1' id='type-id-558'/>
> +    <class-decl name='rte_eth_mirror_conf' size-in-bits='1216'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='670' column='1'
> id='type-id-643'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='rule_type' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='671' column='1'/>
>        </data-member>
> @@ -4676,20 +4673,20 @@
>          <var-decl name='pool_mask' type-id='type-id-11'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='673' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='vlan' type-id='type-id-646' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='675' column='1'/>
> +        <var-decl name='vlan' type-id='type-id-644' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='675' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_vlan_mirror' size-in-bits='1088'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='661' column='1'
> id='type-id-646'>
> +    <class-decl name='rte_eth_vlan_mirror' size-in-bits='1088'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='661' column='1'
> id='type-id-644'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='vlan_mask' type-id='type-id-11'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='662' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='vlan_id' type-id='type-id-379'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='664' column='1'/>
> +        <var-decl name='vlan_id' type-id='type-id-377'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='664' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_mirror_rule_reset_t' type-id='type-id-643'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='424'
> column='1' id='type-id-561'/>
> -    <typedef-decl name='eth_udp_tunnel_port_add_t' type-id='type-id-647'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='428'
> column='1' id='type-id-562'/>
> -    <class-decl name='rte_eth_udp_tunnel' size-in-bits='32'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1023' column='1'
> id='type-id-648'>
> +    <typedef-decl name='eth_mirror_rule_reset_t' type-id='type-id-641'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='424'
> column='1' id='type-id-559'/>
> +    <typedef-decl name='eth_udp_tunnel_port_add_t' type-id='type-id-645'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='428'
> column='1' id='type-id-560'/>
> +    <class-decl name='rte_eth_udp_tunnel' size-in-bits='32'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1023' column='1'
> id='type-id-646'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='udp_port' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1024' column='1'/>
>        </data-member>
> @@ -4697,11 +4694,11 @@
>          <var-decl name='prot_type' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1025' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_udp_tunnel_port_del_t' type-id='type-id-647'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='432'
> column='1' id='type-id-563'/>
> -    <typedef-decl name='eth_l2_tunnel_eth_type_conf_t'
> type-id='type-id-649'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='494'
> column='1' id='type-id-564'/>
> -    <class-decl name='rte_eth_l2_tunnel_conf' size-in-bits='160'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='751'
> column='1' id='type-id-650'>
> +    <typedef-decl name='eth_udp_tunnel_port_del_t' type-id='type-id-645'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='432'
> column='1' id='type-id-561'/>
> +    <typedef-decl name='eth_l2_tunnel_eth_type_conf_t'
> type-id='type-id-647'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='494'
> column='1' id='type-id-562'/>
> +    <class-decl name='rte_eth_l2_tunnel_conf' size-in-bits='160'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='751'
> column='1' id='type-id-648'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='l2_tunnel_type' type-id='type-id-651'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='752' column='1'/>
> +        <var-decl name='l2_tunnel_type' type-id='type-id-649'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='752' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='ether_type' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h'
> line='753' column='1'/>
> @@ -4716,7 +4713,7 @@
>          <var-decl name='pool' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='756'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_eth_tunnel_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='965' column='1'
> id='type-id-651'>
> +    <enum-decl name='rte_eth_tunnel_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='965' column='1'
> id='type-id-649'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_TUNNEL_TYPE_NONE' value='0'/>
>        <enumerator name='RTE_TUNNEL_TYPE_VXLAN' value='1'/>
> @@ -4728,22 +4725,22 @@
>        <enumerator name='RTE_TUNNEL_TYPE_VXLAN_GPE' value='7'/>
>        <enumerator name='RTE_TUNNEL_TYPE_MAX' value='8'/>
>      </enum-decl>
> -    <typedef-decl name='eth_l2_tunnel_offload_set_t'
> type-id='type-id-652'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='498'
> column='1' id='type-id-565'/>
> -    <typedef-decl name='eth_set_queue_rate_limit_t' type-id='type-id-653'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='413'
> column='1' id='type-id-566'/>
> -    <typedef-decl name='rss_hash_update_t' type-id='type-id-654'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='377'
> column='1' id='type-id-567'/>
> -    <typedef-decl name='rss_hash_conf_get_t' type-id='type-id-654'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='381'
> column='1' id='type-id-568'/>
> -    <typedef-decl name='reta_update_t' type-id='type-id-655'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='367'
> column='1' id='type-id-569'/>
> -    <class-decl name='rte_eth_rss_reta_entry64' size-in-bits='1088'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='684' column='1'
> id='type-id-656'>
> +    <typedef-decl name='eth_l2_tunnel_offload_set_t'
> type-id='type-id-650'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='498'
> column='1' id='type-id-563'/>
> +    <typedef-decl name='eth_set_queue_rate_limit_t' type-id='type-id-651'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='413'
> column='1' id='type-id-564'/>
> +    <typedef-decl name='rss_hash_update_t' type-id='type-id-652'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='377'
> column='1' id='type-id-565'/>
> +    <typedef-decl name='rss_hash_conf_get_t' type-id='type-id-652'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='381'
> column='1' id='type-id-566'/>
> +    <typedef-decl name='reta_update_t' type-id='type-id-653'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='367'
> column='1' id='type-id-567'/>
> +    <class-decl name='rte_eth_rss_reta_entry64' size-in-bits='1088'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='684' column='1'
> id='type-id-654'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='mask' type-id='type-id-11' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='685' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='reta' type-id='type-id-379' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='687' column='1'/>
> +        <var-decl name='reta' type-id='type-id-377' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='687' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='reta_query_t' type-id='type-id-655'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='372'
> column='1' id='type-id-570'/>
> -    <typedef-decl name='eth_get_reg_t' type-id='type-id-657'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='471'
> column='1' id='type-id-571'/>
> -    <class-decl name='rte_dev_reg_info' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='13' column='1'
> id='type-id-658'>
> +    <typedef-decl name='reta_query_t' type-id='type-id-653'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='372'
> column='1' id='type-id-568'/>
> +    <typedef-decl name='eth_get_reg_t' type-id='type-id-655'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='471'
> column='1' id='type-id-569'/>
> +    <class-decl name='rte_dev_reg_info' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='13' column='1'
> id='type-id-656'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='data' type-id='type-id-59' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='14'
> column='1'/>
>        </data-member>
> @@ -4760,9 +4757,9 @@
>          <var-decl name='version' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='18'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_get_eeprom_length_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='475'
> column='1' id='type-id-572'/>
> -    <typedef-decl name='eth_get_eeprom_t' type-id='type-id-659'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='478'
> column='1' id='type-id-573'/>
> -    <class-decl name='rte_dev_eeprom_info' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='24' column='1'
> id='type-id-660'>
> +    <typedef-decl name='eth_get_eeprom_length_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='475'
> column='1' id='type-id-570'/>
> +    <typedef-decl name='eth_get_eeprom_t' type-id='type-id-657'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='478'
> column='1' id='type-id-571'/>
> +    <class-decl name='rte_dev_eeprom_info' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='24' column='1'
> id='type-id-658'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='data' type-id='type-id-59' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='25'
> column='1'/>
>        </data-member>
> @@ -4776,9 +4773,9 @@
>          <var-decl name='magic' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='28'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_set_eeprom_t' type-id='type-id-659'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='482'
> column='1' id='type-id-574'/>
> -    <typedef-decl name='eth_get_module_info_t' type-id='type-id-661'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='486'
> column='1' id='type-id-575'/>
> -    <class-decl name='rte_eth_dev_module_info' size-in-bits='64'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='34' column='1'
> id='type-id-662'>
> +    <typedef-decl name='eth_set_eeprom_t' type-id='type-id-657'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='482'
> column='1' id='type-id-572'/>
> +    <typedef-decl name='eth_get_module_info_t' type-id='type-id-659'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='486'
> column='1' id='type-id-573'/>
> +    <class-decl name='rte_eth_dev_module_info' size-in-bits='64'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='34' column='1'
> id='type-id-660'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='type' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h' line='35'
> column='1'/>
>        </data-member>
> @@ -4786,9 +4783,9 @@
>          <var-decl name='eeprom_len' type-id='type-id-7'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_dev_info.h'
> line='36' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_get_module_eeprom_t' type-id='type-id-659'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='490'
> column='1' id='type-id-576'/>
> -    <typedef-decl name='eth_filter_ctrl_t' type-id='type-id-663'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='506'
> column='1' id='type-id-577'/>
> -    <enum-decl name='rte_filter_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='28' column='1'
> id='type-id-664'>
> +    <typedef-decl name='eth_get_module_eeprom_t' type-id='type-id-657'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='490'
> column='1' id='type-id-574'/>
> +    <typedef-decl name='eth_filter_ctrl_t' type-id='type-id-661'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='506'
> column='1' id='type-id-575'/>
> +    <enum-decl name='rte_filter_type'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='28' column='1'
> id='type-id-662'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_ETH_FILTER_NONE' value='0'/>
>        <enumerator name='RTE_ETH_FILTER_MACVLAN' value='1'/>
> @@ -4803,7 +4800,7 @@
>        <enumerator name='RTE_ETH_FILTER_GENERIC' value='10'/>
>        <enumerator name='RTE_ETH_FILTER_MAX' value='11'/>
>      </enum-decl>
> -    <enum-decl name='rte_filter_op'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='46' column='1'
> id='type-id-665'>
> +    <enum-decl name='rte_filter_op'
> filepath='../../dpdk/lib/librte_ethdev/rte_eth_ctrl.h' line='46' column='1'
> id='type-id-663'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_ETH_FILTER_NOP' value='0'/>
>        <enumerator name='RTE_ETH_FILTER_ADD' value='1'/>
> @@ -4816,30 +4813,30 @@
>        <enumerator name='RTE_ETH_FILTER_STATS' value='8'/>
>        <enumerator name='RTE_ETH_FILTER_OP_MAX' value='9'/>
>      </enum-decl>
> -    <typedef-decl name='eth_get_dcb_info' type-id='type-id-666'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='518'
> column='1' id='type-id-578'/>
> -    <class-decl name='rte_eth_dcb_info' size-in-bits='16520'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1377' column='1'
> id='type-id-667'>
> +    <typedef-decl name='eth_get_dcb_info' type-id='type-id-664'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='518'
> column='1' id='type-id-576'/>
> +    <class-decl name='rte_eth_dcb_info' size-in-bits='16520'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1377' column='1'
> id='type-id-665'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='nb_tcs' type-id='type-id-14' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1378'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8'>
> -        <var-decl name='prio_tc' type-id='type-id-387'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1379' column='1'/>
> +        <var-decl name='prio_tc' type-id='type-id-385'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1379' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='72'>
> -        <var-decl name='tc_bws' type-id='type-id-387'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1380' column='1'/>
> +        <var-decl name='tc_bws' type-id='type-id-385'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1380' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='136'>
> -        <var-decl name='tc_queue' type-id='type-id-668'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1382' column='1'/>
> +        <var-decl name='tc_queue' type-id='type-id-666'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1382' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_dcb_tc_queue_mapping' size-in-bits='16384'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1360' column='1'
> id='type-id-668'>
> +    <class-decl name='rte_eth_dcb_tc_queue_mapping' size-in-bits='16384'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1360' column='1'
> id='type-id-666'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tc_rxq' type-id='type-id-356'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1365' column='1'/>
> +        <var-decl name='tc_rxq' type-id='type-id-354'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1365' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8192'>
>          <var-decl name='tc_txq' type-id='type-id-349'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1370' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__9' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1362' column='1'
> id='type-id-355'>
> +    <class-decl name='__anonymous_struct__9' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1362' column='1'
> id='type-id-348'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='base' type-id='type-id-14' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1363'
> column='1'/>
>        </data-member>
> @@ -4847,41 +4844,33 @@
>          <var-decl name='nb_queue' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1364' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__10' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1367' column='1'
> id='type-id-348'>
> -      <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='base' type-id='type-id-14' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1368'
> column='1'/>
> -      </data-member>
> -      <data-member access='public' layout-offset-in-bits='8'>
> -        <var-decl name='nb_queue' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='1369' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <typedef-decl name='eth_timesync_enable_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='441'
> column='1' id='type-id-579'/>
> -    <typedef-decl name='eth_timesync_disable_t' type-id='type-id-595'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='444'
> column='1' id='type-id-580'/>
> -    <typedef-decl name='eth_timesync_read_rx_timestamp_t'
> type-id='type-id-669'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='447'
> column='1' id='type-id-581'/>
> -    <class-decl name='timespec' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='/usr/include/bits/types/struct_timespec.h'
> line='9' column='1' id='type-id-670'>
> +    <typedef-decl name='eth_timesync_enable_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='441'
> column='1' id='type-id-577'/>
> +    <typedef-decl name='eth_timesync_disable_t' type-id='type-id-593'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='444'
> column='1' id='type-id-578'/>
> +    <typedef-decl name='eth_timesync_read_rx_timestamp_t'
> type-id='type-id-667'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='447'
> column='1' id='type-id-579'/>
> +    <class-decl name='timespec' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='/usr/include/bits/types/struct_timespec.h'
> line='9' column='1' id='type-id-668'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tv_sec' type-id='type-id-671'
> visibility='default' filepath='/usr/include/bits/types/struct_timespec.h'
> line='11' column='1'/>
> +        <var-decl name='tv_sec' type-id='type-id-669'
> visibility='default' filepath='/usr/include/bits/types/struct_timespec.h'
> line='11' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tv_nsec' type-id='type-id-672'
> visibility='default' filepath='/usr/include/bits/types/struct_timespec.h'
> line='12' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <typedef-decl name='__time_t' type-id='type-id-366'
> filepath='/usr/include/bits/types.h' line='160' column='1'
> id='type-id-671'/>
> -    <typedef-decl name='__syscall_slong_t' type-id='type-id-366'
> filepath='/usr/include/bits/types.h' line='196' column='1'
> id='type-id-672'/>
> -    <typedef-decl name='eth_timesync_read_tx_timestamp_t'
> type-id='type-id-673'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='452'
> column='1' id='type-id-582'/>
> -    <typedef-decl name='eth_timesync_adjust_time' type-id='type-id-674'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='456'
> column='1' id='type-id-583'/>
> -    <typedef-decl name='int64_t' type-id='type-id-675'
> filepath='/usr/include/bits/stdint-intn.h' line='27' column='1'
> id='type-id-676'/>
> -    <typedef-decl name='__int64_t' type-id='type-id-366'
> filepath='/usr/include/bits/types.h' line='44' column='1' id='type-id-675'/>
> -    <typedef-decl name='eth_timesync_read_time' type-id='type-id-673'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='459'
> column='1' id='type-id-584'/>
> -    <typedef-decl name='eth_timesync_write_time' type-id='type-id-677'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='463'
> column='1' id='type-id-585'/>
> -    <typedef-decl name='eth_read_clock' type-id='type-id-678'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='467'
> column='1' id='type-id-586'/>
> -    <typedef-decl name='eth_xstats_get_by_id_t' type-id='type-id-679'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='188'
> column='1' id='type-id-587'/>
> -    <typedef-decl name='eth_xstats_get_names_by_id_t'
> type-id='type-id-680'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='219'
> column='1' id='type-id-588'/>
> -    <typedef-decl name='eth_tm_ops_get_t' type-id='type-id-681'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='512'
> column='1' id='type-id-589'/>
> -    <typedef-decl name='eth_mtr_ops_get_t' type-id='type-id-681'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='515'
> column='1' id='type-id-590'/>
> -    <typedef-decl name='eth_pool_ops_supported_t' type-id='type-id-682'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='522'
> column='1' id='type-id-591'/>
> -    <typedef-decl name='eth_hairpin_cap_get_t' type-id='type-id-683'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='543'
> column='1' id='type-id-592'/>
> -    <class-decl name='rte_eth_hairpin_cap' size-in-bits='64'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='861' column='1'
> id='type-id-684'>
> +        <var-decl name='tv_nsec' type-id='type-id-670'
> visibility='default' filepath='/usr/include/bits/types/struct_timespec.h'
> line='12' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <typedef-decl name='__time_t' type-id='type-id-364'
> filepath='/usr/include/bits/types.h' line='160' column='1'
> id='type-id-669'/>
> +    <typedef-decl name='__syscall_slong_t' type-id='type-id-364'
> filepath='/usr/include/bits/types.h' line='196' column='1'
> id='type-id-670'/>
> +    <typedef-decl name='eth_timesync_read_tx_timestamp_t'
> type-id='type-id-671'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='452'
> column='1' id='type-id-580'/>
> +    <typedef-decl name='eth_timesync_adjust_time' type-id='type-id-672'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='456'
> column='1' id='type-id-581'/>
> +    <typedef-decl name='int64_t' type-id='type-id-673'
> filepath='/usr/include/bits/stdint-intn.h' line='27' column='1'
> id='type-id-674'/>
> +    <typedef-decl name='__int64_t' type-id='type-id-364'
> filepath='/usr/include/bits/types.h' line='44' column='1' id='type-id-673'/>
> +    <typedef-decl name='eth_timesync_read_time' type-id='type-id-671'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='459'
> column='1' id='type-id-582'/>
> +    <typedef-decl name='eth_timesync_write_time' type-id='type-id-675'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='463'
> column='1' id='type-id-583'/>
> +    <typedef-decl name='eth_read_clock' type-id='type-id-676'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='467'
> column='1' id='type-id-584'/>
> +    <typedef-decl name='eth_xstats_get_by_id_t' type-id='type-id-677'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='188'
> column='1' id='type-id-585'/>
> +    <typedef-decl name='eth_xstats_get_names_by_id_t'
> type-id='type-id-678'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='219'
> column='1' id='type-id-586'/>
> +    <typedef-decl name='eth_tm_ops_get_t' type-id='type-id-679'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='512'
> column='1' id='type-id-587'/>
> +    <typedef-decl name='eth_mtr_ops_get_t' type-id='type-id-679'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='515'
> column='1' id='type-id-588'/>
> +    <typedef-decl name='eth_pool_ops_supported_t' type-id='type-id-680'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='522'
> column='1' id='type-id-589'/>
> +    <typedef-decl name='eth_hairpin_cap_get_t' type-id='type-id-681'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='543'
> column='1' id='type-id-590'/>
> +    <class-decl name='rte_eth_hairpin_cap' size-in-bits='64'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='861' column='1'
> id='type-id-682'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='max_nb_queues' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='863' column='1'/>
>        </data-member>
> @@ -4895,16 +4884,16 @@
>          <var-decl name='max_nb_desc' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='868' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_rx_hairpin_queue_setup_t'
> type-id='type-id-685'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='571'
> column='1' id='type-id-593'/>
> -    <class-decl name='rte_eth_hairpin_conf' size-in-bits='1040'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='890' column='1'
> id='type-id-686'>
> +    <typedef-decl name='eth_rx_hairpin_queue_setup_t'
> type-id='type-id-683'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='571'
> column='1' id='type-id-591'/>
> +    <class-decl name='rte_eth_hairpin_conf' size-in-bits='1040'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='890' column='1'
> id='type-id-684'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='peer_count' type-id='type-id-4'
> visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h'
> line='891' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16'>
> -        <var-decl name='peers' type-id='type-id-375' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='892' column='1'/>
> +        <var-decl name='peers' type-id='type-id-373' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='892' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_hairpin_peer' size-in-bits='32'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='879' column='1'
> id='type-id-374'>
> +    <class-decl name='rte_eth_hairpin_peer' size-in-bits='32'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='879' column='1'
> id='type-id-372'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='port' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='880' column='1'/>
>        </data-member>
> @@ -4912,16 +4901,16 @@
>          <var-decl name='queue' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='881' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='eth_tx_hairpin_queue_setup_t'
> type-id='type-id-685'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='601'
> column='1' id='type-id-594'/>
> -    <class-decl name='rte_intr_handle' size-in-bits='213248'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='69' column='1' id='type-id-458'>
> +    <typedef-decl name='eth_tx_hairpin_queue_setup_t'
> type-id='type-id-683'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='601'
> column='1' id='type-id-592'/>
> +    <class-decl name='rte_intr_handle' size-in-bits='213248'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='69' column='1' id='type-id-456'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='' type-id='type-id-687' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='71' column='1'/>
> +        <var-decl name='' type-id='type-id-685' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='71' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='fd' type-id='type-id-1' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='75' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='type' type-id='type-id-688' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='76' column='1'/>
> +        <var-decl name='type' type-id='type-id-686' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='76' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
>          <var-decl name='max_intr' type-id='type-id-7'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='77' column='1'/>
> @@ -4933,16 +4922,16 @@
>          <var-decl name='efd_counter_size' type-id='type-id-14'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='79' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='efds' type-id='type-id-364' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='80' column='1'/>
> +        <var-decl name='efds' type-id='type-id-362' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='80' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16576'>
> -        <var-decl name='elist' type-id='type-id-368' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='81' column='1'/>
> +        <var-decl name='elist' type-id='type-id-366' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='81' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='213184'>
>          <var-decl name='intr_vec' type-id='type-id-347'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='83' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__3' size-in-bits='32'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='71' column='1' id='type-id-687'>
> +    <union-decl name='__anonymous_union__3' size-in-bits='32'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='71' column='1' id='type-id-685'>
>        <data-member access='private'>
>          <var-decl name='vfio_dev_fd' type-id='type-id-1'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='72' column='1'/>
>        </data-member>
> @@ -4950,7 +4939,7 @@
>          <var-decl name='uio_cfg_fd' type-id='type-id-1'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='73' column='1'/>
>        </data-member>
>      </union-decl>
> -    <enum-decl name='rte_intr_handle_type'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='27' column='1' id='type-id-688'>
> +    <enum-decl name='rte_intr_handle_type'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='27' column='1' id='type-id-686'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_INTR_HANDLE_UNKNOWN' value='0'/>
>        <enumerator name='RTE_INTR_HANDLE_UIO' value='1'/>
> @@ -4965,9 +4954,9 @@
>        <enumerator name='RTE_INTR_HANDLE_VFIO_REQ' value='10'/>
>        <enumerator name='RTE_INTR_HANDLE_MAX' value='11'/>
>      </enum-decl>
> -    <class-decl name='rte_epoll_event' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='61' column='1' id='type-id-367'>
> +    <class-decl name='rte_epoll_event' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='61' column='1' id='type-id-365'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='status' type-id='type-id-689'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='62' column='1'/>
> +        <var-decl name='status' type-id='type-id-687'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='62' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='fd' type-id='type-id-1' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='63' column='1'/>
> @@ -4976,10 +4965,10 @@
>          <var-decl name='epfd' type-id='type-id-1' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='64' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='epdata' type-id='type-id-690'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='65' column='1'/>
> +        <var-decl name='epdata' type-id='type-id-688'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='65' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_epoll_data' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='47' column='1' id='type-id-690'>
> +    <class-decl name='rte_epoll_data' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='47' column='1' id='type-id-688'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='event' type-id='type-id-7' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='48' column='1'/>
>        </data-member>
> @@ -4987,49 +4976,49 @@
>          <var-decl name='data' type-id='type-id-59' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='49' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='cb_fun' type-id='type-id-691'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='50' column='1'/>
> +        <var-decl name='cb_fun' type-id='type-id-689'
> visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='50' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <var-decl name='cb_arg' type-id='type-id-59' visibility='default'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='51' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='rte_intr_event_cb_t' type-id='type-id-692'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='45' column='1' id='type-id-691'/>
> -    <class-decl name='rte_eth_dev_cb_list' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='22'
> column='1' id='type-id-468'>
> +    <typedef-decl name='rte_intr_event_cb_t' type-id='type-id-690'
> filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h'
> line='45' column='1' id='type-id-689'/>
> +    <class-decl name='rte_eth_dev_cb_list' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='22'
> column='1' id='type-id-466'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqh_first' type-id='type-id-693'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='22'
> column='1'/>
> +        <var-decl name='tqh_first' type-id='type-id-691'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='22'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqh_last' type-id='type-id-694'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='22'
> column='1'/>
> +        <var-decl name='tqh_last' type-id='type-id-692'
> visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='22'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rte_eth_rxtx_callback' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='758'
> column='1' id='type-id-695'>
> +    <class-decl name='rte_eth_rxtx_callback' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='758'
> column='1' id='type-id-693'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-376' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='759'
> column='1'/>
> +        <var-decl name='next' type-id='type-id-374' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='759'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='fn' type-id='type-id-696' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='763'
> column='1'/>
> +        <var-decl name='fn' type-id='type-id-694' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='763'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='param' type-id='type-id-59' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='764'
> column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__4' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='760'
> column='1' id='type-id-696'>
> +    <union-decl name='__anonymous_union__4' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='760'
> column='1' id='type-id-694'>
>        <data-member access='private'>
> -        <var-decl name='rx' type-id='type-id-697' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='761'
> column='1'/>
> +        <var-decl name='rx' type-id='type-id-695' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='761'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='tx' type-id='type-id-698' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='762'
> column='1'/>
> +        <var-decl name='tx' type-id='type-id-696' visibility='default'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='762'
> column='1'/>
>        </data-member>
>      </union-decl>
> -    <typedef-decl name='rte_rx_callback_fn' type-id='type-id-699'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1437' column='1'
> id='type-id-697'/>
> -    <typedef-decl name='rte_tx_callback_fn' type-id='type-id-700'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1461' column='1'
> id='type-id-698'/>
> -    <enum-decl name='rte_eth_dev_state'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1467' column='1'
> id='type-id-469'>
> +    <typedef-decl name='rte_rx_callback_fn' type-id='type-id-697'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1437' column='1'
> id='type-id-695'/>
> +    <typedef-decl name='rte_tx_callback_fn' type-id='type-id-698'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1461' column='1'
> id='type-id-696'/>
> +    <enum-decl name='rte_eth_dev_state'
> filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1467' column='1'
> id='type-id-467'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='RTE_ETH_DEV_UNUSED' value='0'/>
>        <enumerator name='RTE_ETH_DEV_ATTACHED' value='1'/>
>        <enumerator name='RTE_ETH_DEV_REMOVED' value='2'/>
>      </enum-decl>
> -    <class-decl name='dpaa_device_id' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='63' column='1' id='type-id-457'>
> +    <class-decl name='dpaa_device_id' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='63' column='1' id='type-id-455'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='fman_id' type-id='type-id-14'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='64' column='1'/>
>        </data-member>
> @@ -5040,166 +5029,166 @@
>          <var-decl name='dev_id' type-id='type-id-4' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='66' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='rte_dpaa_type'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='50' column='1'
> id='type-id-395'>
> +    <enum-decl name='rte_dpaa_type'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='50' column='1'
> id='type-id-393'>
>        <underlying-type type-id='type-id-17'/>
>        <enumerator name='FSL_DPAA_ETH' value='1'/>
>        <enumerator name='FSL_DPAA_CRYPTO' value='2'/>
>      </enum-decl>
> -    <class-decl name='rte_dpaa_driver_list' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='45' column='1'
> id='type-id-407'>
> +    <class-decl name='rte_dpaa_driver_list' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='45' column='1'
> id='type-id-405'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tqh_first' type-id='type-id-398'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='45' column='1'/>
> +        <var-decl name='tqh_first' type-id='type-id-396'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='45' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='tqh_last' type-id='type-id-399'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='45' column='1'/>
> -      </data-member>
> -    </class-decl>
> -    <typedef-decl name='rte_dpaa_probe_t' type-id='type-id-701'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='83' column='1'
> id='type-id-396'/>
> -    <typedef-decl name='rte_dpaa_remove_t' type-id='type-id-702'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='85' column='1'
> id='type-id-397'/>
> -    <pointer-type-def type-id='type-id-45' size-in-bits='64'
> id='type-id-440'/>
> -    <qualified-type-def type-id='type-id-45' const='yes'
> id='type-id-703'/>
> -    <pointer-type-def type-id='type-id-703' size-in-bits='64'
> id='type-id-401'/>
> -    <qualified-type-def type-id='type-id-504' const='yes'
> id='type-id-704'/>
> -    <pointer-type-def type-id='type-id-704' size-in-bits='64'
> id='type-id-466'/>
> -    <qualified-type-def type-id='type-id-405' const='yes'
> id='type-id-705'/>
> -    <pointer-type-def type-id='type-id-705' size-in-bits='64'
> id='type-id-429'/>
> -    <qualified-type-def type-id='type-id-450' const='yes'
> id='type-id-706'/>
> +        <var-decl name='tqh_last' type-id='type-id-397'
> visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h'
> line='45' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <typedef-decl name='rte_dpaa_probe_t' type-id='type-id-699'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='83' column='1'
> id='type-id-394'/>
> +    <typedef-decl name='rte_dpaa_remove_t' type-id='type-id-700'
> filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='85' column='1'
> id='type-id-395'/>
> +    <pointer-type-def type-id='type-id-45' size-in-bits='64'
> id='type-id-438'/>
> +    <qualified-type-def type-id='type-id-45' const='yes'
> id='type-id-701'/>
> +    <pointer-type-def type-id='type-id-701' size-in-bits='64'
> id='type-id-399'/>
> +    <qualified-type-def type-id='type-id-502' const='yes'
> id='type-id-702'/>
> +    <pointer-type-def type-id='type-id-702' size-in-bits='64'
> id='type-id-464'/>
> +    <qualified-type-def type-id='type-id-403' const='yes'
> id='type-id-703'/>
> +    <pointer-type-def type-id='type-id-703' size-in-bits='64'
> id='type-id-427'/>
> +    <qualified-type-def type-id='type-id-448' const='yes'
> id='type-id-704'/>
> +    <pointer-type-def type-id='type-id-704' size-in-bits='64'
> id='type-id-705'/>
> +    <qualified-type-def type-id='type-id-424' const='yes'
> id='type-id-706'/>
>      <pointer-type-def type-id='type-id-706' size-in-bits='64'
> id='type-id-707'/>
> -    <qualified-type-def type-id='type-id-426' const='yes'
> id='type-id-708'/>
> -    <pointer-type-def type-id='type-id-708' size-in-bits='64'
> id='type-id-709'/>
> -    <qualified-type-def type-id='type-id-393' const='yes'
> id='type-id-710'/>
> -    <pointer-type-def type-id='type-id-710' size-in-bits='64'
> id='type-id-428'/>
> -    <qualified-type-def type-id='type-id-686' const='yes'
> id='type-id-711'/>
> +    <qualified-type-def type-id='type-id-391' const='yes'
> id='type-id-708'/>
> +    <pointer-type-def type-id='type-id-708' size-in-bits='64'
> id='type-id-426'/>
> +    <qualified-type-def type-id='type-id-684' const='yes'
> id='type-id-709'/>
> +    <pointer-type-def type-id='type-id-709' size-in-bits='64'
> id='type-id-710'/>
> +    <qualified-type-def type-id='type-id-610' const='yes'
> id='type-id-711'/>
>      <pointer-type-def type-id='type-id-711' size-in-bits='64'
> id='type-id-712'/>
> -    <qualified-type-def type-id='type-id-612' const='yes'
> id='type-id-713'/>
> +    <qualified-type-def type-id='type-id-611' const='yes'
> id='type-id-713'/>
>      <pointer-type-def type-id='type-id-713' size-in-bits='64'
> id='type-id-714'/>
> -    <qualified-type-def type-id='type-id-613' const='yes'
> id='type-id-715'/>
> +    <qualified-type-def type-id='type-id-668' const='yes'
> id='type-id-715'/>
>      <pointer-type-def type-id='type-id-715' size-in-bits='64'
> id='type-id-716'/>
> -    <qualified-type-def type-id='type-id-670' const='yes'
> id='type-id-717'/>
> -    <pointer-type-def type-id='type-id-717' size-in-bits='64'
> id='type-id-718'/>
> -    <qualified-type-def type-id='type-id-7' const='yes' id='type-id-719'/>
> -    <pointer-type-def type-id='type-id-719' size-in-bits='64'
> id='type-id-611'/>
> -    <pointer-type-def type-id='type-id-720' size-in-bits='64'
> id='type-id-625'/>
> -    <qualified-type-def type-id='type-id-11' const='yes'
> id='type-id-721'/>
> -    <pointer-type-def type-id='type-id-721' size-in-bits='64'
> id='type-id-722'/>
> -    <pointer-type-def type-id='type-id-723' size-in-bits='64'
> id='type-id-447'/>
> -    <pointer-type-def type-id='type-id-724' size-in-bits='64'
> id='type-id-424'/>
> -    <pointer-type-def type-id='type-id-725' size-in-bits='64'
> id='type-id-444'/>
> -    <pointer-type-def type-id='type-id-726' size-in-bits='64'
> id='type-id-441'/>
> -    <pointer-type-def type-id='type-id-727' size-in-bits='64'
> id='type-id-443'/>
> -    <pointer-type-def type-id='type-id-728' size-in-bits='64'
> id='type-id-445'/>
> -    <pointer-type-def type-id='type-id-729' size-in-bits='64'
> id='type-id-702'/>
> -    <pointer-type-def type-id='type-id-730' size-in-bits='64'
> id='type-id-701'/>
> -    <pointer-type-def type-id='type-id-731' size-in-bits='64'
> id='type-id-595'/>
> -    <pointer-type-def type-id='type-id-732' size-in-bits='64'
> id='type-id-624'/>
> -    <pointer-type-def type-id='type-id-733' size-in-bits='64'
> id='type-id-682'/>
> -    <pointer-type-def type-id='type-id-734' size-in-bits='64'
> id='type-id-677'/>
> -    <pointer-type-def type-id='type-id-735' size-in-bits='64'
> id='type-id-679'/>
> -    <pointer-type-def type-id='type-id-736' size-in-bits='64'
> id='type-id-663'/>
> -    <pointer-type-def type-id='type-id-737' size-in-bits='64'
> id='type-id-628'/>
> -    <pointer-type-def type-id='type-id-738' size-in-bits='64'
> id='type-id-597'/>
> -    <pointer-type-def type-id='type-id-739' size-in-bits='64'
> id='type-id-659'/>
> -    <pointer-type-def type-id='type-id-740' size-in-bits='64'
> id='type-id-657'/>
> -    <pointer-type-def type-id='type-id-741' size-in-bits='64'
> id='type-id-666'/>
> -    <pointer-type-def type-id='type-id-742' size-in-bits='64'
> id='type-id-609'/>
> -    <pointer-type-def type-id='type-id-743' size-in-bits='64'
> id='type-id-661'/>
> -    <pointer-type-def type-id='type-id-744' size-in-bits='64'
> id='type-id-637'/>
> -    <pointer-type-def type-id='type-id-745' size-in-bits='64'
> id='type-id-683'/>
> -    <pointer-type-def type-id='type-id-746' size-in-bits='64'
> id='type-id-649'/>
> -    <pointer-type-def type-id='type-id-747' size-in-bits='64'
> id='type-id-652'/>
> -    <pointer-type-def type-id='type-id-748' size-in-bits='64'
> id='type-id-644'/>
> -    <pointer-type-def type-id='type-id-749' size-in-bits='64'
> id='type-id-640'/>
> -    <pointer-type-def type-id='type-id-750' size-in-bits='64'
> id='type-id-654'/>
> -    <pointer-type-def type-id='type-id-751' size-in-bits='64'
> id='type-id-655'/>
> -    <pointer-type-def type-id='type-id-752' size-in-bits='64'
> id='type-id-603'/>
> -    <pointer-type-def type-id='type-id-753' size-in-bits='64'
> id='type-id-647'/>
> +    <qualified-type-def type-id='type-id-7' const='yes' id='type-id-717'/>
> +    <pointer-type-def type-id='type-id-717' size-in-bits='64'
> id='type-id-609'/>
> +    <pointer-type-def type-id='type-id-718' size-in-bits='64'
> id='type-id-623'/>
> +    <qualified-type-def type-id='type-id-11' const='yes'
> id='type-id-719'/>
> +    <pointer-type-def type-id='type-id-719' size-in-bits='64'
> id='type-id-720'/>
> +    <pointer-type-def type-id='type-id-721' size-in-bits='64'
> id='type-id-445'/>
> +    <pointer-type-def type-id='type-id-722' size-in-bits='64'
> id='type-id-422'/>
> +    <pointer-type-def type-id='type-id-723' size-in-bits='64'
> id='type-id-442'/>
> +    <pointer-type-def type-id='type-id-724' size-in-bits='64'
> id='type-id-439'/>
> +    <pointer-type-def type-id='type-id-725' size-in-bits='64'
> id='type-id-441'/>
> +    <pointer-type-def type-id='type-id-726' size-in-bits='64'
> id='type-id-443'/>
> +    <pointer-type-def type-id='type-id-727' size-in-bits='64'
> id='type-id-700'/>
> +    <pointer-type-def type-id='type-id-728' size-in-bits='64'
> id='type-id-699'/>
> +    <pointer-type-def type-id='type-id-729' size-in-bits='64'
> id='type-id-593'/>
> +    <pointer-type-def type-id='type-id-730' size-in-bits='64'
> id='type-id-622'/>
> +    <pointer-type-def type-id='type-id-731' size-in-bits='64'
> id='type-id-680'/>
> +    <pointer-type-def type-id='type-id-732' size-in-bits='64'
> id='type-id-675'/>
> +    <pointer-type-def type-id='type-id-733' size-in-bits='64'
> id='type-id-677'/>
> +    <pointer-type-def type-id='type-id-734' size-in-bits='64'
> id='type-id-661'/>
> +    <pointer-type-def type-id='type-id-735' size-in-bits='64'
> id='type-id-626'/>
> +    <pointer-type-def type-id='type-id-736' size-in-bits='64'
> id='type-id-595'/>
> +    <pointer-type-def type-id='type-id-737' size-in-bits='64'
> id='type-id-657'/>
> +    <pointer-type-def type-id='type-id-738' size-in-bits='64'
> id='type-id-655'/>
> +    <pointer-type-def type-id='type-id-739' size-in-bits='64'
> id='type-id-664'/>
> +    <pointer-type-def type-id='type-id-740' size-in-bits='64'
> id='type-id-607'/>
> +    <pointer-type-def type-id='type-id-741' size-in-bits='64'
> id='type-id-659'/>
> +    <pointer-type-def type-id='type-id-742' size-in-bits='64'
> id='type-id-635'/>
> +    <pointer-type-def type-id='type-id-743' size-in-bits='64'
> id='type-id-681'/>
> +    <pointer-type-def type-id='type-id-744' size-in-bits='64'
> id='type-id-647'/>
> +    <pointer-type-def type-id='type-id-745' size-in-bits='64'
> id='type-id-650'/>
> +    <pointer-type-def type-id='type-id-746' size-in-bits='64'
> id='type-id-642'/>
> +    <pointer-type-def type-id='type-id-747' size-in-bits='64'
> id='type-id-638'/>
> +    <pointer-type-def type-id='type-id-748' size-in-bits='64'
> id='type-id-652'/>
> +    <pointer-type-def type-id='type-id-749' size-in-bits='64'
> id='type-id-653'/>
> +    <pointer-type-def type-id='type-id-750' size-in-bits='64'
> id='type-id-601'/>
> +    <pointer-type-def type-id='type-id-751' size-in-bits='64'
> id='type-id-645'/>
> +    <pointer-type-def type-id='type-id-752' size-in-bits='64'
> id='type-id-602'/>
> +    <pointer-type-def type-id='type-id-753' size-in-bits='64'
> id='type-id-678'/>
>      <pointer-type-def type-id='type-id-754' size-in-bits='64'
> id='type-id-604'/>
> -    <pointer-type-def type-id='type-id-755' size-in-bits='64'
> id='type-id-680'/>
> -    <pointer-type-def type-id='type-id-756' size-in-bits='64'
> id='type-id-606'/>
> -    <pointer-type-def type-id='type-id-757' size-in-bits='64'
> id='type-id-600'/>
> -    <pointer-type-def type-id='type-id-758' size-in-bits='64'
> id='type-id-601'/>
> -    <pointer-type-def type-id='type-id-759' size-in-bits='64'
> id='type-id-599'/>
> -    <pointer-type-def type-id='type-id-760' size-in-bits='64'
> id='type-id-642'/>
> -    <pointer-type-def type-id='type-id-761' size-in-bits='64'
> id='type-id-673'/>
> -    <pointer-type-def type-id='type-id-762' size-in-bits='64'
> id='type-id-669'/>
> -    <pointer-type-def type-id='type-id-763' size-in-bits='64'
> id='type-id-674'/>
> -    <pointer-type-def type-id='type-id-764' size-in-bits='64'
> id='type-id-602'/>
> -    <pointer-type-def type-id='type-id-765' size-in-bits='64'
> id='type-id-627'/>
> -    <pointer-type-def type-id='type-id-766' size-in-bits='64'
> id='type-id-622'/>
> -    <pointer-type-def type-id='type-id-767' size-in-bits='64'
> id='type-id-653'/>
> -    <pointer-type-def type-id='type-id-768' size-in-bits='64'
> id='type-id-685'/>
> -    <pointer-type-def type-id='type-id-769' size-in-bits='64'
> id='type-id-631'/>
> -    <pointer-type-def type-id='type-id-770' size-in-bits='64'
> id='type-id-635'/>
> -    <pointer-type-def type-id='type-id-771' size-in-bits='64'
> id='type-id-608'/>
> -    <pointer-type-def type-id='type-id-772' size-in-bits='64'
> id='type-id-626'/>
> -    <pointer-type-def type-id='type-id-773' size-in-bits='64'
> id='type-id-643'/>
> -    <pointer-type-def type-id='type-id-774' size-in-bits='64'
> id='type-id-678'/>
> -    <pointer-type-def type-id='type-id-775' size-in-bits='64'
> id='type-id-681'/>
> -    <pointer-type-def type-id='type-id-776' size-in-bits='64'
> id='type-id-451'/>
> -    <pointer-type-def type-id='type-id-777' size-in-bits='64'
> id='type-id-634'/>
> -    <pointer-type-def type-id='type-id-778' size-in-bits='64'
> id='type-id-636'/>
> -    <pointer-type-def type-id='type-id-405' size-in-bits='64'
> id='type-id-422'/>
> -    <pointer-type-def type-id='type-id-422' size-in-bits='64'
> id='type-id-423'/>
> -    <pointer-type-def type-id='type-id-361' size-in-bits='64'
> id='type-id-438'/>
> -    <pointer-type-def type-id='type-id-362' size-in-bits='64'
> id='type-id-460'/>
> -    <pointer-type-def type-id='type-id-660' size-in-bits='64'
> id='type-id-779'/>
> -    <pointer-type-def type-id='type-id-658' size-in-bits='64'
> id='type-id-780'/>
> -    <pointer-type-def type-id='type-id-433' size-in-bits='64'
> id='type-id-430'/>
> -    <pointer-type-def type-id='type-id-430' size-in-bits='64'
> id='type-id-439'/>
> -    <pointer-type-def type-id='type-id-426' size-in-bits='64'
> id='type-id-431'/>
> -    <pointer-type-def type-id='type-id-781' size-in-bits='64'
> id='type-id-425'/>
> -    <pointer-type-def type-id='type-id-431' size-in-bits='64'
> id='type-id-432'/>
> -    <pointer-type-def type-id='type-id-404' size-in-bits='64'
> id='type-id-394'/>
> -    <pointer-type-def type-id='type-id-454' size-in-bits='64'
> id='type-id-452'/>
> -    <pointer-type-def type-id='type-id-452' size-in-bits='64'
> id='type-id-453'/>
> -    <pointer-type-def type-id='type-id-391' size-in-bits='64'
> id='type-id-398'/>
> -    <pointer-type-def type-id='type-id-398' size-in-bits='64'
> id='type-id-399'/>
> -    <pointer-type-def type-id='type-id-393' size-in-bits='64'
> id='type-id-402'/>
> -    <pointer-type-def type-id='type-id-402' size-in-bits='64'
> id='type-id-403'/>
> -    <pointer-type-def type-id='type-id-623' size-in-bits='64'
> id='type-id-782'/>
> -    <pointer-type-def type-id='type-id-667' size-in-bits='64'
> id='type-id-783'/>
> -    <pointer-type-def type-id='type-id-461' size-in-bits='64'
> id='type-id-459'/>
> -    <pointer-type-def type-id='type-id-363' size-in-bits='64'
> id='type-id-693'/>
> -    <pointer-type-def type-id='type-id-693' size-in-bits='64'
> id='type-id-694'/>
> -    <pointer-type-def type-id='type-id-471' size-in-bits='64'
> id='type-id-465'/>
> -    <pointer-type-def type-id='type-id-610' size-in-bits='64'
> id='type-id-784'/>
> -    <pointer-type-def type-id='type-id-662' size-in-bits='64'
> id='type-id-785'/>
> -    <pointer-type-def type-id='type-id-638' size-in-bits='64'
> id='type-id-786'/>
> -    <pointer-type-def type-id='type-id-684' size-in-bits='64'
> id='type-id-787'/>
> -    <pointer-type-def type-id='type-id-650' size-in-bits='64'
> id='type-id-788'/>
> -    <pointer-type-def type-id='type-id-645' size-in-bits='64'
> id='type-id-789'/>
> -    <pointer-type-def type-id='type-id-641' size-in-bits='64'
> id='type-id-790'/>
> -    <pointer-type-def type-id='type-id-487' size-in-bits='64'
> id='type-id-791'/>
> -    <pointer-type-def type-id='type-id-656' size-in-bits='64'
> id='type-id-792'/>
> -    <pointer-type-def type-id='type-id-619' size-in-bits='64'
> id='type-id-793'/>
> -    <pointer-type-def type-id='type-id-695' size-in-bits='64'
> id='type-id-376'/>
> -    <pointer-type-def type-id='type-id-621' size-in-bits='64'
> id='type-id-794'/>
> -    <pointer-type-def type-id='type-id-648' size-in-bits='64'
> id='type-id-795'/>
> -    <pointer-type-def type-id='type-id-605' size-in-bits='64'
> id='type-id-796'/>
> -    <pointer-type-def type-id='type-id-607' size-in-bits='64'
> id='type-id-797'/>
> -    <pointer-type-def type-id='type-id-23' size-in-bits='64'
> id='type-id-475'/>
> -    <pointer-type-def type-id='type-id-458' size-in-bits='64'
> id='type-id-467'/>
> -    <pointer-type-def type-id='type-id-256' size-in-bits='64'
> id='type-id-798'/>
> -    <pointer-type-def type-id='type-id-670' size-in-bits='64'
> id='type-id-799'/>
> -    <pointer-type-def type-id='type-id-800' size-in-bits='64'
> id='type-id-699'/>
> -    <pointer-type-def type-id='type-id-801' size-in-bits='64'
> id='type-id-700'/>
> -    <pointer-type-def type-id='type-id-802' size-in-bits='64'
> id='type-id-470'/>
> -    <pointer-type-def type-id='type-id-803' size-in-bits='64'
> id='type-id-633'/>
> -    <pointer-type-def type-id='type-id-804' size-in-bits='64'
> id='type-id-692'/>
> -    <pointer-type-def type-id='type-id-805' size-in-bits='64'
> id='type-id-596'/>
> -    <pointer-type-def type-id='type-id-806' size-in-bits='64'
> id='type-id-630'/>
> -    <pointer-type-def type-id='type-id-807' size-in-bits='64'
> id='type-id-618'/>
> -    <pointer-type-def type-id='type-id-808' size-in-bits='64'
> id='type-id-620'/>
> -    <pointer-type-def type-id='type-id-809' size-in-bits='64'
> id='type-id-598'/>
> -    <pointer-type-def type-id='type-id-810' size-in-bits='64'
> id='type-id-632'/>
> -    <pointer-type-def type-id='type-id-811' size-in-bits='64'
> id='type-id-449'/>
> -    <qualified-type-def type-id='type-id-7' volatile='yes'
> id='type-id-689'/>
> +    <pointer-type-def type-id='type-id-755' size-in-bits='64'
> id='type-id-598'/>
> +    <pointer-type-def type-id='type-id-756' size-in-bits='64'
> id='type-id-599'/>
> +    <pointer-type-def type-id='type-id-757' size-in-bits='64'
> id='type-id-597'/>
> +    <pointer-type-def type-id='type-id-758' size-in-bits='64'
> id='type-id-640'/>
> +    <pointer-type-def type-id='type-id-759' size-in-bits='64'
> id='type-id-671'/>
> +    <pointer-type-def type-id='type-id-760' size-in-bits='64'
> id='type-id-667'/>
> +    <pointer-type-def type-id='type-id-761' size-in-bits='64'
> id='type-id-672'/>
> +    <pointer-type-def type-id='type-id-762' size-in-bits='64'
> id='type-id-600'/>
> +    <pointer-type-def type-id='type-id-763' size-in-bits='64'
> id='type-id-625'/>
> +    <pointer-type-def type-id='type-id-764' size-in-bits='64'
> id='type-id-620'/>
> +    <pointer-type-def type-id='type-id-765' size-in-bits='64'
> id='type-id-651'/>
> +    <pointer-type-def type-id='type-id-766' size-in-bits='64'
> id='type-id-683'/>
> +    <pointer-type-def type-id='type-id-767' size-in-bits='64'
> id='type-id-629'/>
> +    <pointer-type-def type-id='type-id-768' size-in-bits='64'
> id='type-id-633'/>
> +    <pointer-type-def type-id='type-id-769' size-in-bits='64'
> id='type-id-606'/>
> +    <pointer-type-def type-id='type-id-770' size-in-bits='64'
> id='type-id-624'/>
> +    <pointer-type-def type-id='type-id-771' size-in-bits='64'
> id='type-id-641'/>
> +    <pointer-type-def type-id='type-id-772' size-in-bits='64'
> id='type-id-676'/>
> +    <pointer-type-def type-id='type-id-773' size-in-bits='64'
> id='type-id-679'/>
> +    <pointer-type-def type-id='type-id-774' size-in-bits='64'
> id='type-id-449'/>
> +    <pointer-type-def type-id='type-id-775' size-in-bits='64'
> id='type-id-632'/>
> +    <pointer-type-def type-id='type-id-776' size-in-bits='64'
> id='type-id-634'/>
> +    <pointer-type-def type-id='type-id-403' size-in-bits='64'
> id='type-id-420'/>
> +    <pointer-type-def type-id='type-id-420' size-in-bits='64'
> id='type-id-421'/>
> +    <pointer-type-def type-id='type-id-359' size-in-bits='64'
> id='type-id-436'/>
> +    <pointer-type-def type-id='type-id-360' size-in-bits='64'
> id='type-id-458'/>
> +    <pointer-type-def type-id='type-id-658' size-in-bits='64'
> id='type-id-777'/>
> +    <pointer-type-def type-id='type-id-656' size-in-bits='64'
> id='type-id-778'/>
> +    <pointer-type-def type-id='type-id-431' size-in-bits='64'
> id='type-id-428'/>
> +    <pointer-type-def type-id='type-id-428' size-in-bits='64'
> id='type-id-437'/>
> +    <pointer-type-def type-id='type-id-424' size-in-bits='64'
> id='type-id-429'/>
> +    <pointer-type-def type-id='type-id-779' size-in-bits='64'
> id='type-id-423'/>
> +    <pointer-type-def type-id='type-id-429' size-in-bits='64'
> id='type-id-430'/>
> +    <pointer-type-def type-id='type-id-402' size-in-bits='64'
> id='type-id-392'/>
> +    <pointer-type-def type-id='type-id-452' size-in-bits='64'
> id='type-id-450'/>
> +    <pointer-type-def type-id='type-id-450' size-in-bits='64'
> id='type-id-451'/>
> +    <pointer-type-def type-id='type-id-389' size-in-bits='64'
> id='type-id-396'/>
> +    <pointer-type-def type-id='type-id-396' size-in-bits='64'
> id='type-id-397'/>
> +    <pointer-type-def type-id='type-id-391' size-in-bits='64'
> id='type-id-400'/>
> +    <pointer-type-def type-id='type-id-400' size-in-bits='64'
> id='type-id-401'/>
> +    <pointer-type-def type-id='type-id-621' size-in-bits='64'
> id='type-id-780'/>
> +    <pointer-type-def type-id='type-id-665' size-in-bits='64'
> id='type-id-781'/>
> +    <pointer-type-def type-id='type-id-459' size-in-bits='64'
> id='type-id-457'/>
> +    <pointer-type-def type-id='type-id-361' size-in-bits='64'
> id='type-id-691'/>
> +    <pointer-type-def type-id='type-id-691' size-in-bits='64'
> id='type-id-692'/>
> +    <pointer-type-def type-id='type-id-469' size-in-bits='64'
> id='type-id-463'/>
> +    <pointer-type-def type-id='type-id-608' size-in-bits='64'
> id='type-id-782'/>
> +    <pointer-type-def type-id='type-id-660' size-in-bits='64'
> id='type-id-783'/>
> +    <pointer-type-def type-id='type-id-636' size-in-bits='64'
> id='type-id-784'/>
> +    <pointer-type-def type-id='type-id-682' size-in-bits='64'
> id='type-id-785'/>
> +    <pointer-type-def type-id='type-id-648' size-in-bits='64'
> id='type-id-786'/>
> +    <pointer-type-def type-id='type-id-643' size-in-bits='64'
> id='type-id-787'/>
> +    <pointer-type-def type-id='type-id-639' size-in-bits='64'
> id='type-id-788'/>
> +    <pointer-type-def type-id='type-id-485' size-in-bits='64'
> id='type-id-789'/>
> +    <pointer-type-def type-id='type-id-654' size-in-bits='64'
> id='type-id-790'/>
> +    <pointer-type-def type-id='type-id-617' size-in-bits='64'
> id='type-id-791'/>
> +    <pointer-type-def type-id='type-id-693' size-in-bits='64'
> id='type-id-374'/>
> +    <pointer-type-def type-id='type-id-619' size-in-bits='64'
> id='type-id-792'/>
> +    <pointer-type-def type-id='type-id-646' size-in-bits='64'
> id='type-id-793'/>
> +    <pointer-type-def type-id='type-id-603' size-in-bits='64'
> id='type-id-794'/>
> +    <pointer-type-def type-id='type-id-605' size-in-bits='64'
> id='type-id-795'/>
> +    <pointer-type-def type-id='type-id-23' size-in-bits='64'
> id='type-id-473'/>
> +    <pointer-type-def type-id='type-id-456' size-in-bits='64'
> id='type-id-465'/>
> +    <pointer-type-def type-id='type-id-256' size-in-bits='64'
> id='type-id-796'/>
> +    <pointer-type-def type-id='type-id-668' size-in-bits='64'
> id='type-id-797'/>
> +    <pointer-type-def type-id='type-id-798' size-in-bits='64'
> id='type-id-697'/>
> +    <pointer-type-def type-id='type-id-799' size-in-bits='64'
> id='type-id-698'/>
> +    <pointer-type-def type-id='type-id-800' size-in-bits='64'
> id='type-id-468'/>
> +    <pointer-type-def type-id='type-id-801' size-in-bits='64'
> id='type-id-631'/>
> +    <pointer-type-def type-id='type-id-802' size-in-bits='64'
> id='type-id-690'/>
> +    <pointer-type-def type-id='type-id-803' size-in-bits='64'
> id='type-id-594'/>
> +    <pointer-type-def type-id='type-id-804' size-in-bits='64'
> id='type-id-628'/>
> +    <pointer-type-def type-id='type-id-805' size-in-bits='64'
> id='type-id-616'/>
> +    <pointer-type-def type-id='type-id-806' size-in-bits='64'
> id='type-id-618'/>
> +    <pointer-type-def type-id='type-id-807' size-in-bits='64'
> id='type-id-596'/>
> +    <pointer-type-def type-id='type-id-808' size-in-bits='64'
> id='type-id-630'/>
> +    <pointer-type-def type-id='type-id-809' size-in-bits='64'
> id='type-id-447'/>
> +    <qualified-type-def type-id='type-id-7' volatile='yes'
> id='type-id-687'/>
>      <var-decl name='dpaa_logtype_mempool' type-id='type-id-1'
> mangled-name='dpaa_logtype_mempool' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='46' column='1'
> elf-symbol-id='dpaa_logtype_mempool@@DPDK_20.0'/>
>      <var-decl name='dpaa_logtype_pmd' type-id='type-id-1'
> mangled-name='dpaa_logtype_pmd' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='47' column='1'
> elf-symbol-id='dpaa_logtype_pmd@@DPDK_20.0'/>
>      <var-decl name='dpaa_logtype_eventdev' type-id='type-id-1'
> mangled-name='dpaa_logtype_eventdev' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='48' column='1'
> elf-symbol-id='dpaa_logtype_eventdev@@DPDK_20.0'/>
>      <var-decl name='dpaa_netcfg' type-id='type-id-41'
> mangled-name='dpaa_netcfg' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='51' column='1'
> elf-symbol-id='dpaa_netcfg@@DPDK_20.0'/>
>      <var-decl name='dpaa_svr_family' type-id='type-id-2'
> mangled-name='dpaa_svr_family' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='56' column='1'
> elf-symbol-id='dpaa_svr_family@@DPDK_20.0'/>
> -    <var-decl name='per_lcore_dpaa_io' type-id='type-id-357'
> mangled-name='per_lcore_dpaa_io' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='60' column='1'
> elf-symbol-id='per_lcore_dpaa_io@@DPDK_20.0'/>
> -    <var-decl name='per_lcore_held_bufs' type-id='type-id-390'
> mangled-name='per_lcore_held_bufs' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='61' column='1'
> elf-symbol-id='per_lcore_held_bufs@@DPDK_20.0'/>
> +    <var-decl name='per_lcore_dpaa_io' type-id='type-id-355'
> mangled-name='per_lcore_dpaa_io' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='60' column='1'
> elf-symbol-id='per_lcore_dpaa_io@@DPDK_20.0'/>
> +    <var-decl name='per_lcore_held_bufs' type-id='type-id-388'
> mangled-name='per_lcore_held_bufs' visibility='default'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='61' column='1'
> elf-symbol-id='per_lcore_held_bufs@@DPDK_20.0'/>
>      <function-decl name='rte_dpaa_portal_init'
> mangled-name='rte_dpaa_portal_init'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='251' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='rte_dpaa_portal_init@@DPDK_20.0'>
>        <parameter type-id='type-id-59' name='arg'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='251' column='1'/>
>        <return type-id='type-id-1'/>
> @@ -5214,399 +5203,399 @@
>        <return type-id='type-id-1'/>
>      </function-decl>
>      <function-decl name='rte_dpaa_driver_register'
> mangled-name='rte_dpaa_driver_register'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='466' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='rte_dpaa_driver_register@@DPDK_20.0'>
> -      <parameter type-id='type-id-398' name='driver'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='466' column='1'/>
> +      <parameter type-id='type-id-396' name='driver'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='466' column='1'/>
>        <return type-id='type-id-20'/>
>      </function-decl>
>      <function-decl name='rte_dpaa_driver_unregister'
> mangled-name='rte_dpaa_driver_unregister'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='479' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='rte_dpaa_driver_unregister@@DPDK_20.0'>
> -      <parameter type-id='type-id-398' name='driver'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='479' column='1'/>
> +      <parameter type-id='type-id-396' name='driver'
> filepath='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' line='479' column='1'/>
>        <return type-id='type-id-20'/>
>      </function-decl>
> -    <function-type size-in-bits='64' id='type-id-720'>
> -      <parameter type-id='type-id-459'/>
> -      <return type-id='type-id-611'/>
> +    <function-type size-in-bits='64' id='type-id-718'>
> +      <parameter type-id='type-id-457'/>
> +      <return type-id='type-id-609'/>
> +    </function-type>
> +    <function-type size-in-bits='64' id='type-id-721'>
> +      <return type-id='type-id-446'/>
> +    </function-type>
> +    <function-type size-in-bits='64' id='type-id-722'>
> +      <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-723'>
> -      <return type-id='type-id-448'/>
> +      <parameter type-id='type-id-399'/>
> +      <parameter type-id='type-id-59'/>
> +      <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-724'>
> +      <parameter type-id='type-id-707'/>
> +      <parameter type-id='type-id-59'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-725'>
> -      <parameter type-id='type-id-401'/>
> -      <parameter type-id='type-id-59'/>
> +      <parameter type-id='type-id-429'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-726'>
> -      <parameter type-id='type-id-709'/>
> +      <parameter type-id='type-id-429'/>
>        <parameter type-id='type-id-59'/>
> +      <parameter type-id='type-id-11'/>
> +      <parameter type-id='type-id-29'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-727'>
> -      <parameter type-id='type-id-431'/>
> +      <parameter type-id='type-id-450'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-728'>
> -      <parameter type-id='type-id-431'/>
> -      <parameter type-id='type-id-59'/>
> -      <parameter type-id='type-id-11'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-396'/>
> +      <parameter type-id='type-id-450'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-729'>
> -      <parameter type-id='type-id-452'/>
> +      <parameter type-id='type-id-457'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-730'>
> -      <parameter type-id='type-id-398'/>
> -      <parameter type-id='type-id-452'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-438'/>
> +      <parameter type-id='type-id-29'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-731'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-399'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-732'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-440'/>
> -      <parameter type-id='type-id-29'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-716'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-733'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-401'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-720'/>
> +      <parameter type-id='type-id-35'/>
> +      <parameter type-id='type-id-2'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-734'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-718'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-662'/>
> +      <parameter type-id='type-id-663'/>
> +      <parameter type-id='type-id-59'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-735'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-722'/>
> -      <parameter type-id='type-id-35'/>
> -      <parameter type-id='type-id-2'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-627'/>
> +      <parameter type-id='type-id-4'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-736'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-664'/>
> -      <parameter type-id='type-id-665'/>
> -      <parameter type-id='type-id-59'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-1'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-737'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-629'/>
> -      <parameter type-id='type-id-4'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-777'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-738'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-1'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-778'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-739'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-779'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-781'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-740'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-780'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-782'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-741'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-783'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-742'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-784'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-743'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-785'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-744'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-786'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-745'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-787'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-786'/>
> +      <parameter type-id='type-id-7'/>
> +      <parameter type-id='type-id-14'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-746'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-788'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-787'/>
> +      <parameter type-id='type-id-14'/>
> +      <parameter type-id='type-id-14'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-747'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-788'/>
> -      <parameter type-id='type-id-7'/>
> -      <parameter type-id='type-id-14'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-748'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-789'/>
> -      <parameter type-id='type-id-14'/>
> -      <parameter type-id='type-id-14'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-749'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-790'/>
> +      <parameter type-id='type-id-4'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-750'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-791'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-34'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-751'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-792'/>
> -      <parameter type-id='type-id-4'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-793'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-752'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-34'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-794'/>
> +      <parameter type-id='type-id-2'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-753'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-795'/>
> +      <parameter type-id='type-id-720'/>
> +      <parameter type-id='type-id-2'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-754'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-796'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-795'/>
>        <parameter type-id='type-id-2'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-755'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-797'/>
> -      <parameter type-id='type-id-722'/>
> -      <parameter type-id='type-id-2'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-473'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-756'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-797'/>
> -      <parameter type-id='type-id-2'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-473'/>
> +      <parameter type-id='type-id-7'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-757'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-475'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-473'/>
> +      <parameter type-id='type-id-7'/>
> +      <parameter type-id='type-id-7'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-758'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-475'/>
> -      <parameter type-id='type-id-7'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-473'/>
> +      <parameter type-id='type-id-14'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-759'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-475'/>
> -      <parameter type-id='type-id-7'/>
> -      <parameter type-id='type-id-7'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-797'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-760'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-475'/>
> -      <parameter type-id='type-id-14'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-797'/>
> +      <parameter type-id='type-id-7'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-761'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-799'/>
> +      <parameter type-id='type-id-457'/>
> +      <parameter type-id='type-id-674'/>
>        <return type-id='type-id-1'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-762'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-799'/>
> -      <parameter type-id='type-id-7'/>
> -      <return type-id='type-id-1'/>
> -    </function-type>
> -    <function-type size-in-bits='64' id='type-id-763'>
> -      <parameter type-id='type-id-459'/>
> -      <parameter type-id='type-id-676'/>
> -      <return type-id='type-id-1'/>
> -    </function-type>
> -    <function-type size-in-bits='64' id='type-id-764'>
> -      <parameter type-id='type-id-459'/>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-765'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-763'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-1'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-766'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-764'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
> -      <parameter type-id='type-id-782'/>
> +      <parameter type-id='type-id-780'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-767'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-765'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-4'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-768'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-766'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-4'/>
> -      <parameter type-id='type-id-712'/>
> +      <parameter type-id='type-id-710'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-769'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-767'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-2'/>
> -      <parameter type-id='type-id-714'/>
> +      <parameter type-id='type-id-712'/>
>        <parameter type-id='type-id-265'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-770'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-768'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-2'/>
> -      <parameter type-id='type-id-716'/>
> +      <parameter type-id='type-id-714'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-771'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-769'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-14'/>
>        <parameter type-id='type-id-14'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-772'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-770'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-7'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-773'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-771'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-14'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-774'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-772'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-35'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-775'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-773'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-59'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-776'>
> +    <function-type size-in-bits='64' id='type-id-774'>
>        <parameter type-id='type-id-59' name='arg'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-777'>
> +    <function-type size-in-bits='64' id='type-id-775'>
>        <parameter type-id='type-id-59'/>
>        <parameter type-id='type-id-4'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-778'>
> +    <function-type size-in-bits='64' id='type-id-776'>
>        <parameter type-id='type-id-59'/>
>        <parameter type-id='type-id-7'/>
>        <return type-id='type-id-1'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-781'>
> -      <parameter type-id='type-id-709'/>
> -      <parameter type-id='type-id-442'/>
> +    <function-type size-in-bits='64' id='type-id-779'>
> +      <parameter type-id='type-id-707'/>
> +      <parameter type-id='type-id-440'/>
>        <parameter type-id='type-id-59'/>
> -      <return type-id='type-id-431'/>
> +      <return type-id='type-id-429'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-800'>
> +    <function-type size-in-bits='64' id='type-id-798'>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-4'/>
> -      <parameter type-id='type-id-798'/>
> +      <parameter type-id='type-id-796'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-59'/>
>        <return type-id='type-id-4'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-801'>
> +    <function-type size-in-bits='64' id='type-id-799'>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-4'/>
> -      <parameter type-id='type-id-798'/>
> +      <parameter type-id='type-id-796'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-59'/>
>        <return type-id='type-id-4'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-802'>
> +    <function-type size-in-bits='64' id='type-id-800'>
>        <parameter type-id='type-id-59'/>
> -      <parameter type-id='type-id-798'/>
> +      <parameter type-id='type-id-796'/>
>        <parameter type-id='type-id-4'/>
>        <return type-id='type-id-4'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-803'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-801'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <return type-id='type-id-7'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-804'>
> +    <function-type size-in-bits='64' id='type-id-802'>
>        <parameter type-id='type-id-1'/>
>        <parameter type-id='type-id-59'/>
>        <return type-id='type-id-20'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-805'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-803'>
> +      <parameter type-id='type-id-457'/>
>        <return type-id='type-id-20'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-806'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-804'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
>        <parameter type-id='type-id-1'/>
>        <return type-id='type-id-20'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-807'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-805'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
> -      <parameter type-id='type-id-793'/>
> +      <parameter type-id='type-id-791'/>
>        <return type-id='type-id-20'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-808'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-806'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-4'/>
> -      <parameter type-id='type-id-794'/>
> +      <parameter type-id='type-id-792'/>
>        <return type-id='type-id-20'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-809'>
> -      <parameter type-id='type-id-459'/>
> +    <function-type size-in-bits='64' id='type-id-807'>
> +      <parameter type-id='type-id-457'/>
>        <parameter type-id='type-id-7'/>
>        <return type-id='type-id-20'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-810'>
> +    <function-type size-in-bits='64' id='type-id-808'>
>        <parameter type-id='type-id-59'/>
>        <return type-id='type-id-20'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-811'>
> +    <function-type size-in-bits='64' id='type-id-809'>
>        <parameter type-id='type-id-59'/>
> -      <parameter type-id='type-id-401'/>
> -      <parameter type-id='type-id-707'/>
> +      <parameter type-id='type-id-399'/>
> +      <parameter type-id='type-id-705'/>
>        <return type-id='type-id-59'/>
>      </function-type>
>    </abi-instr>
> diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
> b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
> index 4901fc5..ba918b7 100644
> --- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
> +++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
> @@ -293,176 +293,159 @@
>      <qualified-type-def type-id='type-id-49' restrict='yes'
> id='type-id-50'/>
>      <pointer-type-def type-id='type-id-28' size-in-bits='64'
> id='type-id-51'/>
>      <qualified-type-def type-id='type-id-51' restrict='yes'
> id='type-id-52'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-53'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-54'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-55'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-56'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-57'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-58'/>
> -    <pointer-type-def type-id='type-id-2' size-in-bits='64'
> id='type-id-59'/>
> -    <qualified-type-def type-id='type-id-59' restrict='yes'
> id='type-id-60'/>
> -    <pointer-type-def type-id='type-id-59' size-in-bits='64'
> id='type-id-61'/>
> -    <qualified-type-def type-id='type-id-61' restrict='yes'
> id='type-id-62'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-53'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-54'/>
> +    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-55'/>
> +    <pointer-type-def type-id='type-id-2' size-in-bits='64'
> id='type-id-56'/>
> +    <qualified-type-def type-id='type-id-56' restrict='yes'
> id='type-id-57'/>
> +    <pointer-type-def type-id='type-id-56' size-in-bits='64'
> id='type-id-58'/>
> +    <qualified-type-def type-id='type-id-58' restrict='yes'
> id='type-id-59'/>
> +    <qualified-type-def type-id='type-id-24' const='yes' id='type-id-60'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-60'
> size-in-bits='64' id='type-id-61'/>
> +    <pointer-type-def type-id='type-id-60' size-in-bits='64'
> id='type-id-62'/>
>      <qualified-type-def type-id='type-id-43' const='yes' id='type-id-63'/>
>      <pointer-type-def type-id='type-id-63' size-in-bits='64'
> id='type-id-41'/>
> -    <qualified-type-def type-id='type-id-24' const='yes' id='type-id-64'/>
> -    <pointer-type-def type-id='type-id-64' size-in-bits='64'
> id='type-id-65'/>
>      <qualified-type-def type-id='type-id-2' const='yes' id='type-id-3'/>
> -    <pointer-type-def type-id='type-id-3' size-in-bits='64'
> id='type-id-66'/>
> +    <pointer-type-def type-id='type-id-3' size-in-bits='64'
> id='type-id-64'/>
> +    <qualified-type-def type-id='type-id-64' restrict='yes'
> id='type-id-65'/>
> +    <pointer-type-def type-id='type-id-64' size-in-bits='64'
> id='type-id-66'/>
>      <qualified-type-def type-id='type-id-66' restrict='yes'
> id='type-id-67'/>
> -    <pointer-type-def type-id='type-id-66' size-in-bits='64'
> id='type-id-68'/>
> -    <qualified-type-def type-id='type-id-68' restrict='yes'
> id='type-id-69'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-4'
> size-in-bits='64' id='type-id-70'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-7'
> size-in-bits='64' id='type-id-71'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-9'
> size-in-bits='64' id='type-id-72'/>
> -    <qualified-type-def type-id='type-id-38' const='yes' id='type-id-73'/>
> -    <pointer-type-def type-id='type-id-73' size-in-bits='64'
> id='type-id-74'/>
> -    <qualified-type-def type-id='type-id-13' const='yes' id='type-id-75'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-75'
> size-in-bits='64' id='type-id-76'/>
> -    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-77'/>
> -    <pointer-type-def type-id='type-id-77' size-in-bits='64'
> id='type-id-78'/>
> -    <qualified-type-def type-id='type-id-24' const='yes' id='type-id-79'/>
> -    <pointer-type-def type-id='type-id-79' size-in-bits='64'
> id='type-id-80'/>
> -    <qualified-type-def type-id='type-id-24' const='yes' id='type-id-81'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-4'
> size-in-bits='64' id='type-id-68'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-7'
> size-in-bits='64' id='type-id-69'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-9'
> size-in-bits='64' id='type-id-70'/>
> +    <qualified-type-def type-id='type-id-38' const='yes' id='type-id-71'/>
> +    <pointer-type-def type-id='type-id-71' size-in-bits='64'
> id='type-id-72'/>
> +    <qualified-type-def type-id='type-id-13' const='yes' id='type-id-73'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-73'
> size-in-bits='64' id='type-id-74'/>
> +    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-75'/>
> +    <pointer-type-def type-id='type-id-75' size-in-bits='64'
> id='type-id-76'/>
> +    <qualified-type-def type-id='type-id-77' const='yes' id='type-id-78'/>
> +    <pointer-type-def type-id='type-id-78' size-in-bits='64'
> id='type-id-79'/>
> +    <qualified-type-def type-id='type-id-80' const='yes' id='type-id-81'/>
>      <pointer-type-def type-id='type-id-81' size-in-bits='64'
> id='type-id-82'/>
> -    <qualified-type-def type-id='type-id-24' const='yes' id='type-id-83'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-83'
> size-in-bits='64' id='type-id-84'/>
> -    <qualified-type-def type-id='type-id-24' const='yes' id='type-id-85'/>
> -    <pointer-type-def type-id='type-id-85' size-in-bits='64'
> id='type-id-86'/>
> -    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-88'/>
> -    <pointer-type-def type-id='type-id-88' size-in-bits='64'
> id='type-id-89'/>
> -    <qualified-type-def type-id='type-id-90' const='yes' id='type-id-91'/>
> -    <pointer-type-def type-id='type-id-91' size-in-bits='64'
> id='type-id-92'/>
> -    <qualified-type-def type-id='type-id-93' const='yes' id='type-id-94'/>
> -    <pointer-type-def type-id='type-id-94' size-in-bits='64'
> id='type-id-95'/>
> +    <qualified-type-def type-id='type-id-83' const='yes' id='type-id-84'/>
> +    <pointer-type-def type-id='type-id-84' size-in-bits='64'
> id='type-id-85'/>
> +    <qualified-type-def type-id='type-id-85' restrict='yes'
> id='type-id-86'/>
> +    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-87'/>
> +    <pointer-type-def type-id='type-id-87' size-in-bits='64'
> id='type-id-88'/>
> +    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-89'/>
> +    <pointer-type-def type-id='type-id-89' size-in-bits='64'
> id='type-id-90'/>
> +    <qualified-type-def type-id='type-id-90' restrict='yes'
> id='type-id-91'/>
> +    <pointer-type-def type-id='type-id-90' size-in-bits='64'
> id='type-id-92'/>
> +    <qualified-type-def type-id='type-id-92' restrict='yes'
> id='type-id-93'/>
> +    <pointer-type-def type-id='type-id-11' size-in-bits='64'
> id='type-id-94'/>
> +    <pointer-type-def type-id='type-id-38' size-in-bits='64'
> id='type-id-95'/>
>      <qualified-type-def type-id='type-id-95' restrict='yes'
> id='type-id-96'/>
> -    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-97'/>
> -    <pointer-type-def type-id='type-id-97' size-in-bits='64'
> id='type-id-98'/>
> -    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-99'/>
> +    <pointer-type-def type-id='type-id-97' size-in-bits='64'
> id='type-id-31'/>
> +    <pointer-type-def type-id='type-id-13' size-in-bits='64'
> id='type-id-98'/>
>      <pointer-type-def type-id='type-id-99' size-in-bits='64'
> id='type-id-100'/>
> -    <qualified-type-def type-id='type-id-100' restrict='yes'
> id='type-id-101'/>
> -    <pointer-type-def type-id='type-id-100' size-in-bits='64'
> id='type-id-102'/>
> -    <qualified-type-def type-id='type-id-102' restrict='yes'
> id='type-id-103'/>
> -    <pointer-type-def type-id='type-id-11' size-in-bits='64'
> id='type-id-104'/>
> -    <pointer-type-def type-id='type-id-38' size-in-bits='64'
> id='type-id-105'/>
> -    <qualified-type-def type-id='type-id-105' restrict='yes'
> id='type-id-106'/>
> -    <pointer-type-def type-id='type-id-107' size-in-bits='64'
> id='type-id-31'/>
> -    <pointer-type-def type-id='type-id-13' size-in-bits='64'
> id='type-id-108'/>
> +    <pointer-type-def type-id='type-id-30' size-in-bits='64'
> id='type-id-101'/>
> +    <qualified-type-def type-id='type-id-101' restrict='yes'
> id='type-id-102'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-103'
> size-in-bits='64' id='type-id-104'/>
> +    <pointer-type-def type-id='type-id-77' size-in-bits='64'
> id='type-id-105'/>
> +    <pointer-type-def type-id='type-id-80' size-in-bits='64'
> id='type-id-106'/>
> +    <pointer-type-def type-id='type-id-107' size-in-bits='64'
> id='type-id-108'/>
>      <pointer-type-def type-id='type-id-109' size-in-bits='64'
> id='type-id-110'/>
> -    <pointer-type-def type-id='type-id-30' size-in-bits='64'
> id='type-id-111'/>
> -    <qualified-type-def type-id='type-id-111' restrict='yes'
> id='type-id-112'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-113'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-114'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-115'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-116'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-117'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-118'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-119'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-120'
> size-in-bits='64' id='type-id-121'/>
> -    <pointer-type-def type-id='type-id-87' size-in-bits='64'
> id='type-id-122'/>
> -    <pointer-type-def type-id='type-id-90' size-in-bits='64'
> id='type-id-123'/>
> -    <pointer-type-def type-id='type-id-124' size-in-bits='64'
> id='type-id-125'/>
> -    <pointer-type-def type-id='type-id-126' size-in-bits='64'
> id='type-id-127'/>
> -    <pointer-type-def type-id='type-id-128' size-in-bits='64'
> id='type-id-129'/>
> -    <pointer-type-def type-id='type-id-130' size-in-bits='64'
> id='type-id-131'/>
> -    <pointer-type-def type-id='type-id-19' size-in-bits='64'
> id='type-id-132'/>
> -    <pointer-type-def type-id='type-id-133' size-in-bits='64'
> id='type-id-134'/>
> -    <pointer-type-def type-id='type-id-22' size-in-bits='64'
> id='type-id-135'/>
> -    <qualified-type-def type-id='type-id-135' restrict='yes'
> id='type-id-136'/>
> -    <pointer-type-def type-id='type-id-23' size-in-bits='64'
> id='type-id-137'/>
> -    <qualified-type-def type-id='type-id-137' restrict='yes'
> id='type-id-138'/>
> -    <pointer-type-def type-id='type-id-137' size-in-bits='64'
> id='type-id-139'/>
> -    <qualified-type-def type-id='type-id-139' restrict='yes'
> id='type-id-140'/>
> +    <pointer-type-def type-id='type-id-111' size-in-bits='64'
> id='type-id-112'/>
> +    <pointer-type-def type-id='type-id-113' size-in-bits='64'
> id='type-id-114'/>
> +    <pointer-type-def type-id='type-id-19' size-in-bits='64'
> id='type-id-115'/>
> +    <pointer-type-def type-id='type-id-116' size-in-bits='64'
> id='type-id-117'/>
> +    <pointer-type-def type-id='type-id-22' size-in-bits='64'
> id='type-id-118'/>
> +    <qualified-type-def type-id='type-id-118' restrict='yes'
> id='type-id-119'/>
> +    <pointer-type-def type-id='type-id-23' size-in-bits='64'
> id='type-id-120'/>
> +    <qualified-type-def type-id='type-id-120' restrict='yes'
> id='type-id-121'/>
> +    <pointer-type-def type-id='type-id-120' size-in-bits='64'
> id='type-id-122'/>
> +    <qualified-type-def type-id='type-id-122' restrict='yes'
> id='type-id-123'/>
>      <namespace-decl name='boost'>
>        <namespace-decl name='optional_detail'>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='protected' static='yes'>
>              <function-decl name='optional_base'
> mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEEC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='239' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='protected' static='yes'>
>              <function-decl name='construct'
> mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEE9constructEOS4_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='479' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <parameter type-id='type-id-141'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-124'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='protected' static='yes'>
>              <function-decl name='optional_base'
> mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEEC2EOS4_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='261' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <parameter type-id='type-id-141'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-124'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>          <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-type access='public'>
> -            <typedef-decl name='rval_reference_type'
> type-id='type-id-114'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='152' column='1' id='type-id-141'/>
> +            <typedef-decl name='rval_reference_type' type-id='type-id-54'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='152' column='1' id='type-id-124'/>
>            </member-type>
>          </class-decl>
>        </namespace-decl>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='intrusive_ptr'
> mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='62' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='swap'
> mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='181' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator='
> mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-56'/>
> -            <return type-id='type-id-55'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~intrusive_ptr'
> mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEED2Ev'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='95' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator bool'
> mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp'
> line='12' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-65' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator!'
> mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp'
> line='61' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-65' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='get'
> mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='154' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-65' is-artificial='yes'/>
> -            <return type-id='type-id-115'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='rval_reference_type' type-id='type-id-141'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='777' column='1' id='type-id-142'/>
> +          <typedef-decl name='rval_reference_type' type-id='type-id-124'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='777' column='1' id='type-id-125'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='optional'
> mangled-name='_ZN5boost8optionalISt6vectorIN5mongo7BSONObjESaIS3_EEEC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='786' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='optional'
> mangled-name='_ZN5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEEC2EOS3_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='799' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-142'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-125'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -470,45 +453,45 @@
>      </namespace-decl>
>      <namespace-decl name='std'>
>        <namespace-decl name='__cxx11'>
> -        <class-decl name='basic_stringstream&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='3136' visibility='default' is-declaration-only='yes'
> id='type-id-90'>
> +        <class-decl name='basic_stringstream&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='3136' visibility='default' is-declaration-only='yes'
> id='type-id-80'>
>            <member-type access='private'>
> -            <typedef-decl name='__string_type' type-id='type-id-87'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream'
> line='669' column='1' id='type-id-143'/>
> +            <typedef-decl name='__string_type' type-id='type-id-77'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream'
> line='669' column='1' id='type-id-126'/>
>            </member-type>
>            <member-function access='public'>
>              <function-decl name='str'
> mangled-name='_ZNKSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEE3strEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream'
> line='765' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-92' is-artificial='yes'/>
> -              <return type-id='type-id-143'/>
> +              <parameter type-id='type-id-82' is-artificial='yes'/>
> +              <return type-id='type-id-126'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' destructor='yes'
> vtable-offset='0'>
>              <function-decl name='~basic_stringstream'
> mangled-name='_ZNSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEED1Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream'
> line='717' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-123' is-artificial='yes'/>
> +              <parameter type-id='type-id-106' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> -        <class-decl name='basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='256' visibility='default' is-declaration-only='yes'
> id='type-id-87'>
> +        <class-decl name='basic_string&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='256' visibility='default' is-declaration-only='yes'
> id='type-id-77'>
>            <member-type access='private'>
> -            <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-144'>
> +            <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-127'>
>                <underlying-type type-id='type-id-18'/>
>              </enum-decl>
>            </member-type>
>            <member-type access='private'>
> -            <typedef-decl name='size_type' type-id='type-id-146'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='82' column='1' id='type-id-145'/>
> +            <typedef-decl name='size_type' type-id='type-id-129'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='82' column='1' id='type-id-128'/>
>            </member-type>
>            <member-type access='private'>
> -            <typedef-decl name='pointer' type-id='type-id-148'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='86' column='1' id='type-id-147'/>
> +            <typedef-decl name='pointer' type-id='type-id-131'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='86' column='1' id='type-id-130'/>
>            </member-type>
>            <member-type access='private'>
> -            <typedef-decl name='const_pointer' type-id='type-id-150'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='87' column='1' id='type-id-149'/>
> +            <typedef-decl name='const_pointer' type-id='type-id-133'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='87' column='1' id='type-id-132'/>
>            </member-type>
>            <member-type access='private'>
>              <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>                <member-function access='public' static='yes'>
>                  <function-decl name='_Alloc_hider'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC2EPcRKS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='108' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                  <parameter type-id='type-id-151' is-artificial='yes'/>
> -                  <parameter type-id='type-id-147'/>
> -                  <parameter type-id='type-id-152'/>
> +                  <parameter type-id='type-id-55' is-artificial='yes'/>
> +                  <parameter type-id='type-id-130'/>
> +                  <parameter type-id='type-id-134'/>
>                    <return type-id='type-id-22'/>
>                  </function-decl>
>                </member-function>
> @@ -525,349 +508,349 @@
>            </member-type>
>            <member-function access='private'>
>              <function-decl name='_M_data'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7_M_dataEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='134' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> -              <return type-id='type-id-147'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
> +              <return type-id='type-id-130'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='c_str'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5c_strEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='1887' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> -              <return type-id='type-id-66'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
> +              <return type-id='type-id-64'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_is_local'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE11_M_is_localEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='169' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_dispose'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_disposeEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='177' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~basic_string'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='542' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_local_data'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_M_local_dataEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='148' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> -              <return type-id='type-id-149'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
> +              <return type-id='type-id-132'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_destroy'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_destroyEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='184' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-145'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-128'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='data'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4dataEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='1897' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> -              <return type-id='type-id-66'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
> +              <return type-id='type-id-64'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='length'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6lengthEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='721' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> -              <return type-id='type-id-145'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
> +              <return type-id='type-id-128'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='empty'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5emptyEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='816' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='assign'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6assignERKS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='1093' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-153'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-135'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator='
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSERKS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='550' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-153'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-135'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='size'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4sizeEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='715' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> -              <return type-id='type-id-145'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
> +              <return type-id='type-id-128'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_local_data'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_M_local_dataEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='138' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <return type-id='type-id-147'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <return type-id='type-id-130'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='basic_string'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='379' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_length'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_lengthEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='130' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-145'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-128'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_set_length'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_M_set_lengthEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='162' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-145'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-128'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='basic_string'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2ERKS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='398' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-153'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-135'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_construct&lt;char *&gt;'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='227' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-59'/>
> -              <parameter type-id='type-id-59'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-56'/>
> +              <parameter type-id='type-id-56'/>
>                <parameter type-id='type-id-24'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_construct_aux&lt;char *&gt;'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE16_M_construct_auxIPcEEvT_S7_St12__false_type'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='191' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-59'/>
> -              <parameter type-id='type-id-59'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-56'/>
> +              <parameter type-id='type-id-56'/>
>                <parameter type-id='type-id-24'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_construct&lt;char *&gt;'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-59'/>
> -              <parameter type-id='type-id-59'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-56'/>
> +              <parameter type-id='type-id-56'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_data'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7_M_dataEPc'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='126' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-147'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-130'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_capacity'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE11_M_capacityEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='158' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-145'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-128'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private' static='yes'>
>              <function-decl name='_S_copy'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7_S_copyEPcPKcm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='294' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-59'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-145'/>
> +              <parameter type-id='type-id-56'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-128'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private' static='yes'>
>              <function-decl name='_S_copy_chars'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_S_copy_charsEPcS5_S5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='340' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-59'/>
> -              <parameter type-id='type-id-59'/>
> -              <parameter type-id='type-id-59'/>
> +              <parameter type-id='type-id-56'/>
> +              <parameter type-id='type-id-56'/>
> +              <parameter type-id='type-id-56'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator='
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='587' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-155'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-137'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='basic_string'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcRKS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='454' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-152'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-134'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_construct&lt;const char *&gt;'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='227' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-66'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-64'/>
>                <parameter type-id='type-id-24'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_construct_aux&lt;const char *&gt;'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE16_M_construct_auxIPKcEEvT_S8_St12__false_type'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='191' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-66'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-64'/>
>                <parameter type-id='type-id-24'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_construct&lt;const char *&gt;'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-66'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-64'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private' static='yes'>
>              <function-decl name='_S_copy_chars'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_S_copy_charsEPcPKcS7_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='344' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-59'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-66'/>
> +              <parameter type-id='type-id-56'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-64'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='append'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendERKS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='982' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-153'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-135'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator+='
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEpLERKS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='941' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-153'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-135'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='basic_string'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcmRKS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='444' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-145'/>
> -              <parameter type-id='type-id-152'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-128'/>
> +              <parameter type-id='type-id-134'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='append'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKc'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='1024' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-66'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-64'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='_M_check_length'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE15_M_check_lengthEmmPKc'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='268' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> -              <parameter type-id='type-id-145'/>
> -              <parameter type-id='type-id-145'/>
> -              <parameter type-id='type-id-66'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
> +              <parameter type-id='type-id-128'/>
> +              <parameter type-id='type-id-128'/>
> +              <parameter type-id='type-id-64'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='basic_string'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EOS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='476' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-155'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-137'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='append'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKcm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='1011' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-145'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-128'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='substr'
> mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6substrEmm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='2293' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-89' is-artificial='yes'/>
> -              <parameter type-id='type-id-145'/>
> -              <parameter type-id='type-id-145'/>
> -              <return type-id='type-id-87'/>
> +              <parameter type-id='type-id-79' is-artificial='yes'/>
> +              <parameter type-id='type-id-128'/>
> +              <parameter type-id='type-id-128'/>
> +              <return type-id='type-id-77'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='replace'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7replaceEmmPKcm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='1578' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-145'/>
> -              <parameter type-id='type-id-145'/>
> -              <parameter type-id='type-id-66'/>
> -              <parameter type-id='type-id-145'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-128'/>
> +              <parameter type-id='type-id-128'/>
> +              <parameter type-id='type-id-64'/>
> +              <parameter type-id='type-id-128'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='insert'
> mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6insertEmPKc'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h'
> line='1392' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-122' is-artificial='yes'/>
> -              <parameter type-id='type-id-145'/>
> -              <parameter type-id='type-id-66'/>
> -              <return type-id='type-id-154'/>
> +              <parameter type-id='type-id-105' is-artificial='yes'/>
> +              <parameter type-id='type-id-128'/>
> +              <parameter type-id='type-id-64'/>
> +              <return type-id='type-id-136'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> -        <class-decl name='basic_stringbuf&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='832' visibility='default' is-declaration-only='yes'
> id='type-id-156'/>
> +        <class-decl name='basic_stringbuf&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='832' visibility='default' is-declaration-only='yes'
> id='type-id-138'/>
>        </namespace-decl>
> -      <typedef-decl name='ptrdiff_t' type-id='type-id-15'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h'
> line='197' column='1' id='type-id-157'/>
> +      <typedef-decl name='ptrdiff_t' type-id='type-id-15'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h'
> line='197' column='1' id='type-id-139'/>
>        <typedef-decl name='size_t' type-id='type-id-21'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h'
> line='196' column='1' id='type-id-47'/>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='size_type' type-id='type-id-47'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='236' column='1' id='type-id-158'/>
> +          <typedef-decl name='size_type' type-id='type-id-47'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='236' column='1' id='type-id-140'/>
>          </member-type>
>          <member-function access='public'>
>            <function-decl name='size'
> mangled-name='_ZNKSt6vectorImSaImEE4sizeEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='654' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-48'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='resize'
> mangled-name='_ZNSt6vectorIcSaIcEE6resizeEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='673' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='data'
> mangled-name='_ZNSt6vectorIhSaIhEE4dataEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='890' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-132'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-115'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl name='_M_erase_at_end'
> mangled-name='_ZNSt6vectorIcSaIcEE15_M_erase_at_endEPc'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1436' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-159'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-141'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected'>
>            <function-decl name='_M_check_len'
> mangled-name='_ZNKSt6vectorImSaImEE12_M_check_lenEmPKc'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1422' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
> -            <parameter type-id='type-id-66'/>
> -            <return type-id='type-id-158'/>
> +            <parameter type-id='type-id-64'/>
> +            <return type-id='type-id-140'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl name='_M_default_append'
> mangled-name='_ZNSt6vectorIcSaIcEE17_M_default_appendEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1400' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='_ZNSt6vectorIhSaIhEE17_M_default_appendEm'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -875,19 +858,19 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='_Tp_alloc_type' type-id='type-id-161'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='75' column='1' id='type-id-160'/>
> +          <typedef-decl name='_Tp_alloc_type' type-id='type-id-143'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='75' column='1' id='type-id-142'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='_M_allocate'
> mangled-name='_ZNSt12_Vector_baseImSaImEE11_M_allocateEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='167' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
> -            <return type-id='type-id-159'/>
> +            <return type-id='type-id-141'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_M_deallocate'
> mangled-name='_ZNSt12_Vector_baseImSaImEE13_M_deallocateEPmm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='174' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-159'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-141'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -895,70 +878,70 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='rebind_alloc&lt;unsigned char&gt;'
> type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-162'/>
> +          <typedef-decl name='rebind_alloc&lt;unsigned char&gt;'
> type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-144'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='pointer' type-id='type-id-132'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='450' column='1' id='type-id-159'/>
> +          <typedef-decl name='pointer' type-id='type-id-115'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='450' column='1' id='type-id-141'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='allocator_type' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='445' column='1' id='type-id-120'/>
> +          <typedef-decl name='allocator_type' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='445' column='1' id='type-id-103'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='allocate'
> mangled-name='_ZNSt16allocator_traitsISaImEE8allocateERS0_m'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='490' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> +            <parameter type-id='type-id-104'/>
>              <parameter type-id='type-id-48'/>
> -            <return type-id='type-id-159'/>
> +            <return type-id='type-id-141'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='deallocate'
> mangled-name='_ZNSt16allocator_traitsISaImEE10deallocateERS0_Pmm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='516' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-159'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-141'/>
>              <parameter type-id='type-id-48'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> naming-typedef-id='type-id-162' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> naming-typedef-id='type-id-144' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__4' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='__int_type' type-id='type-id-20'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h'
> line='241' column='1' id='type-id-163'/>
> +          <typedef-decl name='__int_type' type-id='type-id-20'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h'
> line='241' column='1' id='type-id-145'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='__atomic_base'
> mangled-name='_ZNSt13__atomic_baseIjEC2Ej'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h'
> line='256' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-163'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-145'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='fetch_sub'
> mangled-name='_ZNSt13__atomic_baseIjE9fetch_subEjSt12memory_order'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h'
> line='522' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-163'/>
> -            <parameter type-id='type-id-164'/>
> -            <return type-id='type-id-163'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-145'/>
> +            <parameter type-id='type-id-146'/>
> +            <return type-id='type-id-145'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='load'
> mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h'
> line='390' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <parameter type-id='type-id-164'/>
> -            <return type-id='type-id-163'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-146'/>
> +            <return type-id='type-id-145'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-165'>
> +      <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-147'>
>          <underlying-type type-id='type-id-18'/>
>        </enum-decl>
> -      <typedef-decl name='memory_order' type-id='type-id-165'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h'
> line='63' column='1' id='type-id-164'/>
> +      <typedef-decl name='memory_order' type-id='type-id-147'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h'
> line='63' column='1' id='type-id-146'/>
>        <class-decl name='__anonymous_struct__5' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='__integral_type' type-id='type-id-20'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic'
> line='626' column='1' id='type-id-166'/>
> +          <typedef-decl name='__integral_type' type-id='type-id-20'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic'
> line='626' column='1' id='type-id-148'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic'
> line='635' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-166'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-148'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -966,19 +949,19 @@
>        <class-decl name='__anonymous_struct__6' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__uninit_default_n&lt;unsigned char *,
> unsigned long&gt;'
> mangled-name='_ZNSt27__uninitialized_default_n_1ILb1EE18__uninit_default_nIPhmEET_S3_T0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='535' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-132'/>
> +            <parameter type-id='type-id-115'/>
>              <parameter type-id='type-id-21'/>
> -            <return type-id='type-id-132'/>
> +            <return type-id='type-id-115'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__7' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__copy_m&lt;unsigned char&gt;'
> mangled-name='_ZNSt11__copy_moveILb1ELb1ESt26random_access_iterator_tagE8__copy_mIhEEPT_PKS3_S6_S4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h'
> line='373' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-98'/>
> -            <parameter type-id='type-id-98'/>
> -            <parameter type-id='type-id-132'/>
> -            <return type-id='type-id-132'/>
> +            <parameter type-id='type-id-88'/>
> +            <parameter type-id='type-id-88'/>
> +            <parameter type-id='type-id-115'/>
> +            <return type-id='type-id-115'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -987,77 +970,77 @@
>            <function-decl
> name='__uninit_copy&lt;std::move_iterator&lt;unsigned char *&gt;, unsigned
> char *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb1EE13__uninit_copyISt13move_iteratorIPhES3_EET0_T_S6_S5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='91' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-132'/>
> -            <return type-id='type-id-132'/>
> +            <parameter type-id='type-id-115'/>
> +            <return type-id='type-id-115'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__10' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='const_pointer' type-id='type-id-66'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='453' column='1' id='type-id-167'/>
> +          <typedef-decl name='const_pointer' type-id='type-id-64'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='453' column='1' id='type-id-149'/>
>          </member-type>
>        </class-decl>
> -      <class-decl name='allocator&lt;char&gt;' size-in-bits='8'
> visibility='default' is-declaration-only='yes' id='type-id-168'/>
> -      <class-decl name='basic_streambuf&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='512' visibility='default'
> is-declaration-only='yes' id='type-id-130'>
> +      <class-decl name='allocator&lt;char&gt;' size-in-bits='8'
> visibility='default' is-declaration-only='yes' id='type-id-150'/>
> +      <class-decl name='basic_streambuf&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='512' visibility='default'
> is-declaration-only='yes' id='type-id-113'>
>          <member-function access='public' destructor='yes'
> vtable-offset='0'>
>            <function-decl name='~basic_streambuf'
> mangled-name='_ZNSt15basic_streambufIcSt11char_traitsIcEED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf'
> line='197' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-131' is-artificial='yes'/>
> +            <parameter type-id='type-id-114' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='basic_istream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='2240' visibility='default'
> is-declaration-only='yes' id='type-id-128'>
> +      <class-decl name='basic_istream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='2240' visibility='default'
> is-declaration-only='yes' id='type-id-111'>
>          <member-function access='public'>
>            <function-decl name='gcount' mangled-name='_ZNKSi6gcountEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream'
> line='269' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-169' is-artificial='yes'/>
> -            <return type-id='type-id-170'/>
> +            <parameter type-id='type-id-151' is-artificial='yes'/>
> +            <return type-id='type-id-152'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='0'>
>            <function-decl name='~basic_istream' mangled-name='_ZNSiD2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream'
> line='103' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-129' is-artificial='yes'/>
> +            <parameter type-id='type-id-112' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='basic_iostream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default'
> is-declaration-only='yes' id='type-id-126'>
> +      <class-decl name='basic_iostream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default'
> is-declaration-only='yes' id='type-id-109'>
>          <member-function access='public' destructor='yes'
> vtable-offset='0'>
>            <function-decl name='~basic_iostream' mangled-name='_ZNSdD2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream'
> line='856' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-127' is-artificial='yes'/>
> +            <parameter type-id='type-id-110' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt;
> &gt;' size-in-bits='2112' visibility='default' is-declaration-only='yes'
> id='type-id-124'>
> +      <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt;
> &gt;' size-in-bits='2112' visibility='default' is-declaration-only='yes'
> id='type-id-107'>
>          <member-function access='public'>
>            <function-decl name='rdstate'
> mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE7rdstateEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h'
> line='137' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-171' is-artificial='yes'/>
> -            <return type-id='type-id-172'/>
> +            <parameter type-id='type-id-153' is-artificial='yes'/>
> +            <return type-id='type-id-154'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='setstate'
> mangled-name='_ZNSt9basic_iosIcSt11char_traitsIcEE8setstateESt12_Ios_Iostate'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h'
> line='157' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-125' is-artificial='yes'/>
> -            <parameter type-id='type-id-172'/>
> +            <parameter type-id='type-id-108' is-artificial='yes'/>
> +            <parameter type-id='type-id-154'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='eof'
> mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE3eofEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h'
> line='190' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-171' is-artificial='yes'/>
> +            <parameter type-id='type-id-153' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='fail'
> mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE4failEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h'
> line='201' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-171' is-artificial='yes'/>
> +            <parameter type-id='type-id-153' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='0'>
>            <function-decl name='~basic_ios'
> mangled-name='_ZNSt9basic_iosIcSt11char_traitsIcEED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h'
> line='282' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-125' is-artificial='yes'/>
> +            <parameter type-id='type-id-108' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -1067,16 +1050,16 @@
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='StatusWith'
> mangled-name='_ZN5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEEC2ENS_6StatusE'
> filepath='src/mongo/base/status_with.h' line='92' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='StatusWith'
> mangled-name='_ZN5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEEC2ENS_10ErrorCodes5ErrorERKN10mongoutils3str6streamE'
> filepath='src/mongo/base/status_with.h' line='78' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-173'/>
> -            <parameter type-id='type-id-84'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-155'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -1084,38 +1067,38 @@
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='data'
> mangled-name='_ZNK5mongo14ConstDataRange4dataEv'
> filepath='src/mongo/base/data_range.h' line='60' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-66'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-64'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='length'
> mangled-name='_ZNK5mongo14ConstDataRange6lengthEv'
> filepath='src/mongo/base/data_range.h' line='64' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='ConstDataRange'
> mangled-name='_ZN5mongo14ConstDataRangeC2EPKcS2_l'
> filepath='src/mongo/base/data_range.h' line='52' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='ConstDataRange'
> mangled-name='_ZN5mongo14ConstDataRangeC2EPKcml'
> filepath='src/mongo/base/data_range.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-47'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-173'>
> +          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-155'>
>              <underlying-type type-id='type-id-18'/>
>            </enum-decl>
>          </member-type>
> @@ -1125,21 +1108,21 @@
>            <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='Holder'
> mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm'
> filepath='src/mongo/util/shared_buffer.h' line='102' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-115' is-artificial='yes'/>
> -                <parameter type-id='type-id-174'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
> +                <parameter type-id='type-id-156'/>
>                  <parameter type-id='type-id-26'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' static='yes'>
>                <function-decl name='data'
> mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv'
> filepath='src/mongo/util/shared_buffer.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-115' is-artificial='yes'/>
> -                <return type-id='type-id-59'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
> +                <return type-id='type-id-56'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' static='yes'>
>                <function-decl name='isShared'
> mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv'
> filepath='src/mongo/util/shared_buffer.h' line='129' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-82' is-artificial='yes'/>
> +                <parameter type-id='type-id-62' is-artificial='yes'/>
>                  <return type-id='type-id-1'/>
>                </function-decl>
>              </member-function>
> @@ -1147,7 +1130,7 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='SharedBuffer'
> mangled-name='_ZN5mongo12SharedBufferC2Ev'
> filepath='src/mongo/util/shared_buffer.h' line='44' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -1159,20 +1142,20 @@
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='takeOwnership'
> mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm'
> filepath='src/mongo/util/shared_buffer.h' line='149' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-135'/>
> +            <parameter type-id='type-id-118'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='get'
> mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv'
> filepath='src/mongo/util/shared_buffer.h' line='75' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-59'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='realloc'
> mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm'
> filepath='src/mongo/util/shared_buffer.h' line='62' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -1180,46 +1163,46 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='WordType' type-id='type-id-20'
> filepath='src/mongo/platform/atomic_word.h' line='54' column='1'
> id='type-id-174'/>
> +          <typedef-decl name='WordType' type-id='type-id-20'
> filepath='src/mongo/platform/atomic_word.h' line='54' column='1'
> id='type-id-156'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='AtomicWord'
> mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej'
> filepath='src/mongo/platform/atomic_word.h' line='59' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-174'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-156'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='fetchAndSubtract'
> mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj'
> filepath='src/mongo/platform/atomic_word.h' line='131' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-174'/>
> -            <return type-id='type-id-174'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-156'/>
> +            <return type-id='type-id-156'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='subtractAndFetch'
> mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj'
> filepath='src/mongo/platform/atomic_word.h' line='153' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-174'/>
> -            <return type-id='type-id-174'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-156'/>
> +            <return type-id='type-id-156'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='load'
> mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv'
> filepath='src/mongo/platform/atomic_word.h' line='66' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-174'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-156'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='SharedBufferAllocator'
> mangled-name='_ZN5mongo21SharedBufferAllocatorC2Ev'
> filepath='src/mongo/bson/util/builder.h' line='82' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='malloc'
> mangled-name='_ZN5mongo21SharedBufferAllocator6mallocEm'
> filepath='src/mongo/bson/util/builder.h' line='92' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -1228,28 +1211,28 @@
>        <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_BufBuilder'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei'
> filepath='src/mongo/bson/util/builder.h' line='158' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='grow'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi'
> filepath='src/mongo/bson/util/builder.h' line='287' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
> -            <return type-id='type-id-59'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='grow_reallocate'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi'
> filepath='src/mongo/bson/util/builder.h' line='342' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_BufBuilder'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei'
> filepath='src/mongo/bson/util/builder.h' line='158' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -1258,89 +1241,89 @@
>        <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='StringBuilderImpl'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEEC2Ev'
> filepath='src/mongo/bson/util/builder.h' line='395' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='append'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE6appendENS_10StringDataE'
> filepath='src/mongo/bson/util/builder.h' line='469' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_10StringDataE'
> filepath='src/mongo/bson/util/builder.h' line='439' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEPKc'
> filepath='src/mongo/bson/util/builder.h' line='436' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> -            <return type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEi'
> filepath='src/mongo/bson/util/builder.h' line='400' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEc'
> filepath='src/mongo/bson/util/builder.h' line='432' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-2'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='appendIntegral&lt;int&gt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIiEERS2_T_i'
> filepath='src/mongo/bson/util/builder.h' line='498' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIiEERS2_T_i'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <parameter type-id='type-id-13'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='copyTo'
> mangled-name='_ZNK5mongo10StringData6copyToEPcb'
> filepath='src/mongo/base/string_data.h' line='134' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <parameter type-id='type-id-59'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-56'/>
>              <parameter type-id='type-id-1'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='StringData'
> mangled-name='_ZN5mongo10StringDataC2EPKc'
> filepath='src/mongo/base/string_data.h' line='78' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='StringData'
> mangled-name='_ZN5mongo10StringDataC2EPKcm'
> filepath='src/mongo/base/string_data.h' line='94' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='StringData'
> mangled-name='_ZN5mongo10StringDataC2EPKc'
> filepath='src/mongo/base/string_data.h' line='78' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo10StringDataC2EPKc'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='StringData'
> mangled-name='_ZN5mongo10StringDataC2EPKc'
> filepath='src/mongo/base/string_data.h' line='78' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo10StringDataC2EPKc'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -1348,7 +1331,7 @@
>        <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='private'>
>            <function-decl name='Status'
> mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h'
> line='161' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -1361,14 +1344,14 @@
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='compress'
> mangled-name='_ZN5mongo15BlockCompressor8compressENS_14ConstDataRangeE'
> filepath='src/mongo/db/ftdc/block_compressor.h' line='55' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15BlockCompressor8compressENS_14ConstDataRangeE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='uncompress'
> mangled-name='_ZN5mongo15BlockCompressor10uncompressENS_14ConstDataRangeEm'
> filepath='src/mongo/db/ftdc/block_compressor.h' line='66' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15BlockCompressor10uncompressENS_14ConstDataRangeEm'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-24'/>
> @@ -1378,7 +1361,7 @@
>        <class-decl name='__anonymous_struct__11' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator StringData'
> mangled-name='_ZN5mongo4ItoAcvNS_10StringDataEEv'
> filepath='src/mongo/util/itoa.h' line='53' column='1' visibility='default'
> binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
> @@ -1392,12 +1375,12 @@
>        </function-decl>
>        <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='pointer' type-id='type-id-159'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='104' column='1' id='type-id-148'/>
> +          <typedef-decl name='pointer' type-id='type-id-141'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='104' column='1' id='type-id-131'/>
>          </member-type>
>          <member-type access='public'>
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-type access='public'>
> -              <typedef-decl name='other' type-id='type-id-162'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='169' column='1' id='type-id-161'/>
> +              <typedef-decl name='other' type-id='type-id-144'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='169' column='1' id='type-id-143'/>
>              </member-type>
>            </class-decl>
>          </member-type>
> @@ -1405,16 +1388,16 @@
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='allocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorImE8allocateEmPKv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='99' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
> -            <parameter type-id='type-id-135'/>
> -            <return type-id='type-id-148'/>
> +            <parameter type-id='type-id-118'/>
> +            <return type-id='type-id-131'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='deallocate'
> mangled-name='_ZN9__gnu_cxx13new_allocatorImE10deallocateEPmm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='109' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-148'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-131'/>
>              <parameter type-id='type-id-48'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -1422,130 +1405,130 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='size_type' type-id='type-id-158'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='106' column='1' id='type-id-146'/>
> +          <typedef-decl name='size_type' type-id='type-id-140'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='106' column='1' id='type-id-129'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='const_pointer' type-id='type-id-167'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='105' column='1' id='type-id-150'/>
> +          <typedef-decl name='const_pointer' type-id='type-id-149'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='105' column='1' id='type-id-133'/>
>          </member-type>
>        </class-decl>
>        <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>      </namespace-decl>
>      <function-decl name='memchr' filepath='/usr/include/string.h'
> line='92' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-135'/>
> +      <parameter type-id='type-id-118'/>
>        <parameter type-id='type-id-13'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-135'/>
> +      <return type-id='type-id-118'/>
>      </function-decl>
>      <function-decl name='memcmp' filepath='/usr/include/string.h'
> line='65' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-135'/>
> -      <parameter type-id='type-id-135'/>
> +      <parameter type-id='type-id-118'/>
> +      <parameter type-id='type-id-118'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='memcpy' filepath='/usr/include/string.h'
> line='42' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-136'/>
> -      <parameter type-id='type-id-136'/>
> +      <parameter type-id='type-id-119'/>
> +      <parameter type-id='type-id-119'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-135'/>
> +      <return type-id='type-id-118'/>
>      </function-decl>
>      <function-decl name='memmove' filepath='/usr/include/string.h'
> line='46' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-135'/>
> -      <parameter type-id='type-id-135'/>
> +      <parameter type-id='type-id-118'/>
> +      <parameter type-id='type-id-118'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-135'/>
> +      <return type-id='type-id-118'/>
>      </function-decl>
>      <function-decl name='memset' filepath='/usr/include/string.h'
> line='62' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-135'/>
> +      <parameter type-id='type-id-118'/>
>        <parameter type-id='type-id-13'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-135'/>
> +      <return type-id='type-id-118'/>
>      </function-decl>
>      <function-decl name='strcat' filepath='/usr/include/string.h'
> line='133' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-67'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-65'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strcmp' filepath='/usr/include/string.h'
> line='140' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='strcoll' filepath='/usr/include/string.h'
> line='147' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='strcpy' filepath='/usr/include/string.h'
> line='125' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-67'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-65'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strcspn' filepath='/usr/include/string.h'
> line='280' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='strerror' filepath='/usr/include/string.h'
> line='408' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-13'/>
> -      <return type-id='type-id-59'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strlen' filepath='/usr/include/string.h'
> line='394' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='strncat' filepath='/usr/include/string.h'
> line='136' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-59'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strncmp' filepath='/usr/include/string.h'
> line='143' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
> +      <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='strncpy' filepath='/usr/include/string.h'
> line='128' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-59'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strspn' filepath='/usr/include/string.h'
> line='284' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='strtok' filepath='/usr/include/string.h'
> line='343' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-67'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-65'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strxfrm' filepath='/usr/include/string.h'
> line='150' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='strchr' filepath='/usr/include/string.h'
> line='231' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-13'/>
> -      <return type-id='type-id-59'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strpbrk' filepath='/usr/include/string.h'
> line='310' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> -      <parameter type-id='type-id-66'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-64'/>
> +      <parameter type-id='type-id-64'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strrchr' filepath='/usr/include/string.h'
> line='258' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-13'/>
> -      <return type-id='type-id-59'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='strstr' filepath='/usr/include/string.h'
> line='337' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> -      <parameter type-id='type-id-66'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-64'/>
> +      <parameter type-id='type-id-64'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='btowc' filepath='/usr/include/wchar.h'
> line='391' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-13'/>
> @@ -1556,10 +1539,10 @@
>        <return type-id='type-id-27'/>
>      </function-decl>
>      <function-decl name='fgetws' filepath='/usr/include/wchar.h'
> line='777' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> +      <parameter type-id='type-id-121'/>
>        <parameter type-id='type-id-13'/>
>        <parameter type-id='type-id-52'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='fputwc' filepath='/usr/include/wchar.h'
> line='762' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-23'/>
> @@ -1567,7 +1550,7 @@
>        <return type-id='type-id-27'/>
>      </function-decl>
>      <function-decl name='fputws' filepath='/usr/include/wchar.h'
> line='784' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter type-id='type-id-52'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
> @@ -1578,13 +1561,13 @@
>      </function-decl>
>      <function-decl name='fwprintf' filepath='/usr/include/wchar.h'
> line='597' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-52'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='fwscanf' filepath='/usr/include/wchar.h'
> line='638' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-52'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
> @@ -1596,27 +1579,27 @@
>        <return type-id='type-id-27'/>
>      </function-decl>
>      <function-decl name='mbrlen' filepath='/usr/include/wchar.h'
> line='402' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-112'/>
> +      <parameter type-id='type-id-102'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='mbrtowc' filepath='/usr/include/wchar.h'
> line='368' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-112'/>
> +      <parameter type-id='type-id-102'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='mbsinit' filepath='/usr/include/wchar.h'
> line='364' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-78'/>
> +      <parameter type-id='type-id-76'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h'
> line='411' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-69'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-67'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-112'/>
> +      <parameter type-id='type-id-102'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='putwc' filepath='/usr/include/wchar.h'
> line='763' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -1629,15 +1612,15 @@
>        <return type-id='type-id-27'/>
>      </function-decl>
>      <function-decl name='swprintf' filepath='/usr/include/wchar.h'
> line='607' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> +      <parameter type-id='type-id-121'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='swscanf' filepath='/usr/include/wchar.h'
> line='648' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
> @@ -1648,142 +1631,142 @@
>      </function-decl>
>      <function-decl name='vfwprintf' filepath='/usr/include/wchar.h'
> line='615' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-52'/>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vfwscanf' filepath='/usr/include/wchar.h'
> line='692' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-52'/>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vswprintf' filepath='/usr/include/wchar.h'
> line='628' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> +      <parameter type-id='type-id-121'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vswscanf' filepath='/usr/include/wchar.h'
> line='704' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vwprintf' filepath='/usr/include/wchar.h'
> line='623' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vwscanf' filepath='/usr/include/wchar.h'
> line='700' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='wcrtomb' filepath='/usr/include/wchar.h'
> line='373' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> +      <parameter type-id='type-id-57'/>
>        <parameter type-id='type-id-23'/>
> -      <parameter type-id='type-id-112'/>
> +      <parameter type-id='type-id-102'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcscat' filepath='/usr/include/wchar.h'
> line='157' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-101'/>
> -      <return type-id='type-id-137'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-91'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcscmp' filepath='/usr/include/wchar.h'
> line='166' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
> +      <parameter type-id='type-id-90'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='wcscoll' filepath='/usr/include/wchar.h'
> line='195' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
> +      <parameter type-id='type-id-90'/>
>        <return type-id='type-id-13'/>
>      </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-138'/>
> -      <parameter type-id='type-id-101'/>
> -      <return type-id='type-id-137'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-91'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcscspn' filepath='/usr/include/wchar.h'
> line='255' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
> +      <parameter type-id='type-id-90'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcsftime' filepath='/usr/include/wchar.h'
> line='858' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> +      <parameter type-id='type-id-121'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-96'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-86'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcslen' filepath='/usr/include/wchar.h'
> line='290' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcsncat' filepath='/usr/include/wchar.h'
> line='161' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcsncmp' filepath='/usr/include/wchar.h'
> line='169' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
> +      <parameter type-id='type-id-90'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='wcsncpy' filepath='/usr/include/wchar.h'
> line='152' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h'
> line='417' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-103'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-93'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-112'/>
> +      <parameter type-id='type-id-102'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcsspn' filepath='/usr/include/wchar.h'
> line='259' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
> +      <parameter type-id='type-id-90'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='wcstod' filepath='/usr/include/wchar.h'
> line='453' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <return type-id='type-id-11'/>
>      </function-decl>
>      <function-decl name='wcstof' filepath='/usr/include/wchar.h'
> line='460' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <return type-id='type-id-12'/>
>      </function-decl>
>      <function-decl name='wcstok' filepath='/usr/include/wchar.h'
> line='285' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> -      <return type-id='type-id-137'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcstol' filepath='/usr/include/wchar.h'
> line='471' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <function-decl name='wcstoul' filepath='/usr/include/wchar.h'
> line='476' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-21'/>
>      </function-decl>
>      <function-decl name='wcsxfrm' filepath='/usr/include/wchar.h'
> line='199' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
> @@ -1792,89 +1775,89 @@
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='wmemcmp' filepath='/usr/include/wchar.h'
> line='328' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
> +      <parameter type-id='type-id-90'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='wmemcpy' filepath='/usr/include/wchar.h'
> line='332' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wmemmove' filepath='/usr/include/wchar.h'
> line='337' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-137'/>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-120'/>
> +      <parameter type-id='type-id-90'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wmemset' filepath='/usr/include/wchar.h'
> line='341' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-137'/>
> +      <parameter type-id='type-id-120'/>
>        <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wprintf' filepath='/usr/include/wchar.h'
> line='604' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='wscanf' filepath='/usr/include/wchar.h'
> line='645' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='wcschr' filepath='/usr/include/wchar.h'
> line='230' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
>        <parameter type-id='type-id-23'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcspbrk' filepath='/usr/include/wchar.h'
> line='269' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> -      <parameter type-id='type-id-100'/>
> -      <return type-id='type-id-137'/>
> +      <parameter type-id='type-id-90'/>
> +      <parameter type-id='type-id-90'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcsrchr' filepath='/usr/include/wchar.h'
> line='240' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
>        <parameter type-id='type-id-23'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcsstr' filepath='/usr/include/wchar.h'
> line='280' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> -      <parameter type-id='type-id-100'/>
> -      <return type-id='type-id-137'/>
> +      <parameter type-id='type-id-90'/>
> +      <parameter type-id='type-id-90'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wmemchr' filepath='/usr/include/wchar.h'
> line='323' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-100'/>
> +      <parameter type-id='type-id-90'/>
>        <parameter type-id='type-id-23'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-137'/>
> +      <return type-id='type-id-120'/>
>      </function-decl>
>      <function-decl name='wcstold' filepath='/usr/include/wchar.h'
> line='462' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <return type-id='type-id-14'/>
>      </function-decl>
>      <function-decl name='wcstoll' filepath='/usr/include/wchar.h'
> line='486' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-16'/>
>      </function-decl>
>      <function-decl name='wcstoull' filepath='/usr/include/wchar.h'
> line='493' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-17'/>
>      </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-13'/>
> -      <parameter type-id='type-id-66'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-64'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='localeconv' filepath='/usr/include/locale.h'
> line='127' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <return type-id='type-id-110'/>
> +      <return type-id='type-id-100'/>
>      </function-decl>
>      <function-decl name='isalnum' filepath='/usr/include/ctype.h'
> line='110' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-13'/>
> @@ -1940,37 +1923,37 @@
>        <return type-id='type-id-13'/>
>      </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-134'/>
> +      <parameter type-id='type-id-117'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl 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-134'/>
> +      <parameter type-id='type-id-117'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='atof'
> filepath='/usr/include/x86_64-linux-gnu/bits/stdlib-float.h' line='26'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-11'/>
>      </function-decl>
>      <function-decl name='atoi' filepath='/usr/include/stdlib.h'
> line='278' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='atol' filepath='/usr/include/stdlib.h'
> line='283' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <function-decl name='bsearch'
> filepath='/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h' line='20'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-135'/>
> -      <parameter type-id='type-id-135'/>
> +      <parameter type-id='type-id-118'/>
> +      <parameter type-id='type-id-118'/>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-32'/>
> -      <return type-id='type-id-135'/>
> +      <return type-id='type-id-118'/>
>      </function-decl>
>      <function-decl name='calloc' filepath='/usr/include/stdlib.h'
> line='468' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-135'/>
> +      <return type-id='type-id-118'/>
>      </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-13'/>
> @@ -1982,12 +1965,12 @@
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <function-decl name='free' filepath='/usr/include/stdlib.h'
> line='483' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-135'/>
> +      <parameter type-id='type-id-118'/>
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <function-decl name='getenv' filepath='/usr/include/stdlib.h'
> line='564' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-64'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='labs' filepath='/usr/include/stdlib.h'
> line='775' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-15'/>
> @@ -2000,27 +1983,27 @@
>      </function-decl>
>      <function-decl name='malloc' filepath='/usr/include/stdlib.h'
> line='466' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-135'/>
> +      <return type-id='type-id-118'/>
>      </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-66'/>
> +      <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-13'/>
>      </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-138'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='mbtowc' filepath='/usr/include/stdlib.h'
> line='865' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-121'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-13'/>
>      </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-135'/>
> +      <parameter type-id='type-id-118'/>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-32'/>
> @@ -2034,43 +2017,43 @@
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='realloc' filepath='/usr/include/stdlib.h'
> line='480' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-135'/>
> +      <parameter type-id='type-id-118'/>
>        <parameter type-id='type-id-26'/>
> -      <return type-id='type-id-135'/>
> +      <return type-id='type-id-118'/>
>      </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-20'/>
>        <return type-id='type-id-22'/>
>      </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-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <return type-id='type-id-11'/>
>      </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-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-15'/>
>      </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-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-21'/>
>      </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-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-13'/>
>      </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-60'/>
> -      <parameter type-id='type-id-101'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-91'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <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-59'/>
> +      <parameter type-id='type-id-56'/>
>        <parameter type-id='type-id-23'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
> @@ -2088,29 +2071,29 @@
>        <return type-id='type-id-25'/>
>      </function-decl>
>      <function-decl name='atoll' filepath='/usr/include/stdlib.h'
> line='292' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-16'/>
>      </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-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-16'/>
>      </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-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-17'/>
>      </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-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <return type-id='type-id-12'/>
>      </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-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <return type-id='type-id-14'/>
>      </function-decl>
>      <function-decl name='clearerr' filepath='/usr/include/stdio.h'
> line='826' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -2139,23 +2122,23 @@
>      </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-50'/>
> -      <parameter type-id='type-id-106'/>
> +      <parameter type-id='type-id-96'/>
>        <return type-id='type-id-13'/>
>      </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-60'/>
> +      <parameter type-id='type-id-57'/>
>        <parameter type-id='type-id-13'/>
>        <parameter type-id='type-id-50'/>
> -      <return type-id='type-id-59'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='fopen' filepath='/usr/include/stdio.h'
> line='272' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-65'/>
>        <return type-id='type-id-49'/>
>      </function-decl>
>      <function-decl name='fprintf' filepath='/usr/include/stdio.h'
> line='356' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-50'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
> @@ -2165,26 +2148,26 @@
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='fputs' filepath='/usr/include/stdio.h'
> line='689' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-50'/>
>        <return type-id='type-id-13'/>
>      </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-136'/>
> +      <parameter type-id='type-id-119'/>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-50'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='freopen' filepath='/usr/include/stdio.h'
> line='278' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter type-id='type-id-50'/>
>        <return type-id='type-id-49'/>
>      </function-decl>
>      <function-decl name='fscanf' filepath='/usr/include/stdio.h'
> line='425' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-50'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
> @@ -2196,7 +2179,7 @@
>      </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-49'/>
> -      <parameter type-id='type-id-74'/>
> +      <parameter type-id='type-id-72'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='ftell' filepath='/usr/include/stdio.h'
> line='754' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -2204,7 +2187,7 @@
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <function-decl name='fwrite' filepath='/usr/include/stdio.h'
> line='715' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-136'/>
> +      <parameter type-id='type-id-119'/>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-26'/>
>        <parameter type-id='type-id-50'/>
> @@ -2218,11 +2201,11 @@
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='perror' filepath='/usr/include/stdio.h'
> line='846' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <function-decl name='printf' filepath='/usr/include/stdio.h'
> line='362' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
> @@ -2236,16 +2219,16 @@
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='puts' filepath='/usr/include/stdio.h' line='695'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-13'/>
>      </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-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-13'/>
>      </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-66'/>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='rewind' filepath='/usr/include/stdio.h'
> line='759' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -2253,31 +2236,31 @@
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <function-decl name='scanf' filepath='/usr/include/stdio.h'
> line='431' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='setbuf' filepath='/usr/include/stdio.h'
> line='332' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-50'/>
> -      <parameter type-id='type-id-60'/>
> +      <parameter type-id='type-id-57'/>
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <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-50'/>
> -      <parameter type-id='type-id-60'/>
> +      <parameter type-id='type-id-57'/>
>        <parameter type-id='type-id-13'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='sprintf' filepath='/usr/include/stdio.h'
> line='364' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='sscanf' filepath='/usr/include/stdio.h'
> line='433' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
> @@ -2285,8 +2268,8 @@
>        <return type-id='type-id-49'/>
>      </function-decl>
>      <function-decl name='tmpnam' filepath='/usr/include/stdio.h'
> line='209' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-59'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-56'/>
> +      <return type-id='type-id-56'/>
>      </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-13'/>
> @@ -2295,50 +2278,50 @@
>      </function-decl>
>      <function-decl name='vfprintf' filepath='/usr/include/stdio.h'
> line='371' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-50'/>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vprintf'
> filepath='/usr/include/x86_64-linux-gnu/bits/stdio.h' line='36' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vsprintf' filepath='/usr/include/stdio.h'
> line='379' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-57'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='snprintf' filepath='/usr/include/stdio.h'
> line='386' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> +      <parameter type-id='type-id-57'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-67'/>
> +      <parameter type-id='type-id-65'/>
>        <parameter is-variadic='yes'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vfscanf' filepath='/usr/include/stdio.h'
> line='471' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <parameter type-id='type-id-50'/>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vscanf' filepath='/usr/include/stdio.h'
> line='479' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vsnprintf' filepath='/usr/include/stdio.h'
> line='390' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> +      <parameter type-id='type-id-57'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='vsscanf' filepath='/usr/include/stdio.h'
> line='483' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-53'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-55'/>
>        <return type-id='type-id-13'/>
>      </function-decl>
>      <function-decl name='acos'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='54'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> @@ -2389,7 +2372,7 @@
>      </function-decl>
>      <function-decl name='frexp'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='103'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-11'/>
> -      <parameter type-id='type-id-108'/>
> +      <parameter type-id='type-id-98'/>
>        <return type-id='type-id-11'/>
>      </function-decl>
>      <function-decl name='ldexp'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='106'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> @@ -2407,7 +2390,7 @@
>      </function-decl>
>      <function-decl name='modf'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='115'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-11'/>
> -      <parameter type-id='type-id-104'/>
> +      <parameter type-id='type-id-94'/>
>        <return type-id='type-id-11'/>
>      </function-decl>
>      <function-decl name='pow'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='153'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> @@ -2733,15 +2716,15 @@
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <function-decl name='nan'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='228'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-11'/>
>      </function-decl>
>      <function-decl name='nanf'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='228'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-12'/>
>      </function-decl>
>      <function-decl name='nanl'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='228'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-14'/>
>      </function-decl>
>      <function-decl name='nearbyint'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='315'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> @@ -2804,19 +2787,19 @@
>      <function-decl name='remquo'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-11'/>
>        <parameter type-id='type-id-11'/>
> -      <parameter type-id='type-id-108'/>
> +      <parameter type-id='type-id-98'/>
>        <return type-id='type-id-11'/>
>      </function-decl>
>      <function-decl name='remquof'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-12'/>
>        <parameter type-id='type-id-12'/>
> -      <parameter type-id='type-id-108'/>
> +      <parameter type-id='type-id-98'/>
>        <return type-id='type-id-12'/>
>      </function-decl>
>      <function-decl name='remquol'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <parameter type-id='type-id-14'/>
>        <parameter type-id='type-id-14'/>
> -      <parameter type-id='type-id-108'/>
> +      <parameter type-id='type-id-98'/>
>        <return type-id='type-id-14'/>
>      </function-decl>
>      <function-decl name='rint'
> filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='289'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> @@ -2964,11 +2947,11 @@
>        <return type-id='type-id-27'/>
>      </function-decl>
>      <function-decl name='wctrans' filepath='/usr/include/wctype.h'
> line='218' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-42'/>
>      </function-decl>
>      <function-decl name='wctype' filepath='/usr/include/wctype.h'
> line='171' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <return type-id='type-id-40'/>
>      </function-decl>
>      <function-decl name='imaxabs' filepath='/usr/include/inttypes.h'
> line='290' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -2981,26 +2964,26 @@
>        <return type-id='type-id-45'/>
>      </function-decl>
>      <function-decl name='strtoimax' filepath='/usr/include/inttypes.h'
> line='324' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-44'/>
>      </function-decl>
>      <function-decl name='strtoumax' filepath='/usr/include/inttypes.h'
> line='336' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-62'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-59'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-46'/>
>      </function-decl>
>      <function-decl name='wcstoimax' filepath='/usr/include/inttypes.h'
> line='348' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-44'/>
>      </function-decl>
>      <function-decl name='wcstoumax' filepath='/usr/include/inttypes.h'
> line='362' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-140'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-123'/>
>        <parameter type-id='type-id-13'/>
>        <return type-id='type-id-46'/>
>      </function-decl>
> @@ -3009,106 +2992,99 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [25]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA25_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-72'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-70'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;int&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIiEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-76'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-74'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [21]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA21_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-70'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-68'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [24]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA24_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-71'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-69'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>        </namespace-decl>
>      </namespace-decl>
> -    <function-type size-in-bits='64' id='type-id-107'>
> -      <parameter type-id='type-id-135'/>
> -      <parameter type-id='type-id-135'/>
> +    <function-type size-in-bits='64' id='type-id-97'>
> +      <parameter type-id='type-id-118'/>
> +      <parameter type-id='type-id-118'/>
>        <return type-id='type-id-13'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-133'>
> +    <function-type size-in-bits='64' id='type-id-116'>
>        <return type-id='type-id-22'/>
>      </function-type>
> -    <class-decl name='lconv' size-in-bits='768' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-109'/>
> -    <class-decl name='tm' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-93'/>
> +    <class-decl name='lconv' size-in-bits='768' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-99'/>
> +    <class-decl name='tm' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-83'/>
>      <class-decl name='__anonymous_struct__4' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-34'
> visibility='default' is-declaration-only='yes' id='type-id-33'/>
>      <class-decl name='__anonymous_struct__6' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-37'
> visibility='default' is-declaration-only='yes' id='type-id-39'/>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='src/mongo/db/ftdc/collector.cpp'
> comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb'
> language='LANG_C_plus_plus'>
> -    <typedef-decl name='clock_t' type-id='type-id-175'
> filepath='/usr/include/time.h' line='59' column='1' id='type-id-176'/>
> -    <typedef-decl name='__clock_t' type-id='type-id-15'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1'
> id='type-id-175'/>
> -    <typedef-decl name='time_t' type-id='type-id-177'
> filepath='/usr/include/time.h' line='75' column='1' id='type-id-178'/>
> -    <typedef-decl name='__time_t' type-id='type-id-15'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1'
> id='type-id-177'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-179'/>
> -    <qualified-type-def type-id='type-id-24' const='yes'
> id='type-id-180'/>
> -    <pointer-type-def type-id='type-id-180' size-in-bits='64'
> id='type-id-181'/>
> -    <qualified-type-def type-id='type-id-181' restrict='yes'
> id='type-id-182'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-64'
> size-in-bits='64' id='type-id-183'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-3'
> size-in-bits='64' id='type-id-184'/>
> -    <qualified-type-def type-id='type-id-185' const='yes'
> id='type-id-186'/>
> -    <pointer-type-def type-id='type-id-186' size-in-bits='64'
> id='type-id-187'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-79'
> size-in-bits='64' id='type-id-188'/>
> -    <qualified-type-def type-id='type-id-189' const='yes'
> id='type-id-190'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-190'
> size-in-bits='64' id='type-id-191'/>
> -    <qualified-type-def type-id='type-id-178' const='yes'
> id='type-id-192'/>
> -    <pointer-type-def type-id='type-id-192' size-in-bits='64'
> id='type-id-193'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-194'
> size-in-bits='64' id='type-id-195'/>
> -    <pointer-type-def type-id='type-id-196' size-in-bits='64'
> id='type-id-197'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-197'
> size-in-bits='64' id='type-id-198'/>
> -    <pointer-type-def type-id='type-id-199' size-in-bits='64'
> id='type-id-200'/>
> -    <pointer-type-def type-id='type-id-185' size-in-bits='64'
> id='type-id-201'/>
> -    <pointer-type-def type-id='type-id-202' size-in-bits='64'
> id='type-id-203'/>
> -    <pointer-type-def type-id='type-id-26' size-in-bits='64'
> id='type-id-204'/>
> -    <qualified-type-def type-id='type-id-119' const='yes'
> id='type-id-205'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-205'
> size-in-bits='64' id='type-id-206'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-207'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-208'/>
> -    <pointer-type-def type-id='type-id-178' size-in-bits='64'
> id='type-id-209'/>
> +    <typedef-decl name='clock_t' type-id='type-id-157'
> filepath='/usr/include/time.h' line='59' column='1' id='type-id-158'/>
> +    <typedef-decl name='__clock_t' type-id='type-id-15'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1'
> id='type-id-157'/>
> +    <typedef-decl name='time_t' type-id='type-id-159'
> filepath='/usr/include/time.h' line='75' column='1' id='type-id-160'/>
> +    <typedef-decl name='__time_t' type-id='type-id-15'
> filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1'
> id='type-id-159'/>
> +    <qualified-type-def type-id='type-id-55' const='yes'
> id='type-id-161'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-161'
> size-in-bits='64' id='type-id-162'/>
> +    <qualified-type-def type-id='type-id-62' restrict='yes'
> id='type-id-163'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-3'
> size-in-bits='64' id='type-id-164'/>
> +    <qualified-type-def type-id='type-id-165' const='yes'
> id='type-id-166'/>
> +    <pointer-type-def type-id='type-id-166' size-in-bits='64'
> id='type-id-167'/>
> +    <qualified-type-def type-id='type-id-168' const='yes'
> id='type-id-169'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-169'
> size-in-bits='64' id='type-id-170'/>
> +    <qualified-type-def type-id='type-id-160' const='yes'
> id='type-id-171'/>
> +    <pointer-type-def type-id='type-id-171' size-in-bits='64'
> id='type-id-172'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-173'
> size-in-bits='64' id='type-id-174'/>
> +    <pointer-type-def type-id='type-id-175' size-in-bits='64'
> id='type-id-176'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-176'
> size-in-bits='64' id='type-id-177'/>
> +    <pointer-type-def type-id='type-id-178' size-in-bits='64'
> id='type-id-179'/>
> +    <pointer-type-def type-id='type-id-165' size-in-bits='64'
> id='type-id-180'/>
> +    <pointer-type-def type-id='type-id-181' size-in-bits='64'
> id='type-id-182'/>
> +    <pointer-type-def type-id='type-id-26' size-in-bits='64'
> id='type-id-183'/>
> +    <pointer-type-def type-id='type-id-160' size-in-bits='64'
> id='type-id-184'/>
>      <namespace-decl name='boost'>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='intrusive_ptr'
> mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2EOS4_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='intrusive_ptr'
> mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='90' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-183'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator='
> mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSERKS4_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp'
> line='127' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-183'/>
> -            <return type-id='type-id-55'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>      </namespace-decl>
>      <namespace-decl name='std'>
>        <namespace-decl name='__cxx11'>
> -        <typedef-decl name='string' type-id='type-id-87'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h'
> line='74' column='1' id='type-id-189'/>
> +        <typedef-decl name='string' type-id='type-id-77'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h'
> line='74' column='1' id='type-id-168'/>
>        </namespace-decl>
>        <namespace-decl name='this_thread'>
>          <function-decl name='get_id'
> mangled-name='_ZNSt11this_thread6get_idEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='263' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -3125,46 +3101,46 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='const_iterator' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='233' column='1' id='type-id-210'/>
> +          <typedef-decl name='const_iterator' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='233' column='1' id='type-id-185'/>
>          </member-type>
>          <member-type access='private'>
> -          <typedef-decl name='iterator' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='231' column='1' id='type-id-211'/>
> +          <typedef-decl name='iterator' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='231' column='1' id='type-id-186'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='emplace_back&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;'
> mangled-name='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE12emplace_backIJS5_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='936' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='begin'
> mangled-name='_ZNKSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE5beginEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='556' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <return type-id='type-id-210'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-185'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='empty'
> mangled-name='_ZNKSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE5emptyEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='743' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='begin'
> mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE5beginEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='547' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-211'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-186'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='end'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE3endEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='565' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-211'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-186'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl
> name='_M_emplace_back_aux&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;'
> mangled-name='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1417' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3173,56 +3149,56 @@
>          <member-type access='private'>
>            <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>              <member-type access='private'>
> -              <typedef-decl name='type' type-id='type-id-197'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='143' column='1' id='type-id-212'/>
> +              <typedef-decl name='type' type-id='type-id-176'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='143' column='1' id='type-id-187'/>
>              </member-type>
>            </class-decl>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='get'
> mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EE3getEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='304' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <return type-id='type-id-159'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-141'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='release'
> mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EE7releaseEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='325' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-159'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-141'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unique_ptr'
> mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEC2EOS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='205' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator-&gt;'
> mangled-name='_ZNKSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEptEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='296' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <return type-id='type-id-159'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-141'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~unique_ptr'
> mangled-name='_ZNSt10unique_ptrIN5mongo14BSONObjBuilderESt14default_deleteIS1_EED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='232' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'
> vtable-offset='0'>
>            <function-decl name='~_Sp_counted_ptr_inplace'
> mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EED0Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='526' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EED2Ev'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' vtable-offset='2'>
>            <function-decl name='_M_dispose'
> mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' vtable-offset='3'>
>            <function-decl name='_M_destroy'
> mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='536' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3230,23 +3206,23 @@
>        <class-decl name='__anonymous_struct__3' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <class-decl name='__anonymous_struct__4' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl
> name='rebind_alloc&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;'
> type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-213'/>
> +          <typedef-decl
> name='rebind_alloc&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;'
> type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-188'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='construct&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt;,
> std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;'
> mangled-name='_ZNSt16allocator_traitsISaISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EEEE9constructIS5_JS5_EEEvRS6_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-119'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> naming-typedef-id='type-id-213' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> naming-typedef-id='type-id-188' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__6' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Head_base&lt;mongo::FTDCCollectorInterface *&gt;'
> mangled-name='_ZNSt10_Head_baseILm0EPN5mongo22FTDCCollectorInterfaceELb0EEC2IS2_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-198'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-177'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3254,9 +3230,9 @@
>        <class-decl name='__anonymous_struct__7' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Tuple_impl&lt;mongo::FTDCCollectorInterface *,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; , void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEEC2IS2_JS4_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-198'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-177'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3264,8 +3240,8 @@
>        <class-decl name='__anonymous_struct__8' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator()'
> mangled-name='_ZNKSt14default_deleteIN5mongo22FTDCCollectorInterfaceEEclEPS1_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='70' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <parameter type-id='type-id-197'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-176'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3273,9 +3249,9 @@
>        <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::FTDCCollectorInterface *,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt;, void&gt;'
> mangled-name='_ZNSt5tupleIJPN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEEC2IS2_S4_vEEOT_OT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='612' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-198'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-177'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3283,17 +3259,17 @@
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::BSONObj, mongo::Date_t
> &amp;, void&gt;'
> mangled-name='_ZNSt5tupleIJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_RS2_vEEOT_OT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='612' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::BSONObj, mongo::Date_t,
> void&gt;'
> mangled-name='_ZNSt5tupleIJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_S2_vEEOT_OT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='612' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3312,15 +3288,15 @@
>        <class-decl name='__anonymous_struct__14' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Head_base&lt;mongo::Date_t &amp;&gt;'
> mangled-name='_ZNSt10_Head_baseILm2EN5mongo6Date_tELb0EEC2IRS1_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Head_base&lt;mongo::Date_t&gt;'
> mangled-name='_ZNSt10_Head_baseILm2EN5mongo6Date_tELb0EEC2IS1_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3328,15 +3304,15 @@
>        <class-decl name='__anonymous_struct__15' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::Date_t &amp;&gt;'
> mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo6Date_tEEEC2IRS1_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='361' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::Date_t&gt;'
> mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6Date_tEEEC2IS1_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='361' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3344,17 +3320,17 @@
>        <class-decl name='__anonymous_struct__16' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::BSONObj,
> mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_JRS2_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::BSONObj,
> mongo::Date_t, void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_JS2_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3362,8 +3338,8 @@
>        <class-decl name='__anonymous_struct__17' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Head_base&lt;mongo::BSONObj&gt;'
> mangled-name='_ZNSt10_Head_baseILm1EN5mongo7BSONObjELb0EEC2IS1_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3371,10 +3347,10 @@
>        <class-decl name='__anonymous_struct__18' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='fetch_add'
> mangled-name='_ZNSt13__atomic_baseIjE9fetch_addEjSt12memory_order'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h'
> line='512' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-163'/>
> -            <parameter type-id='type-id-164'/>
> -            <return type-id='type-id-163'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-145'/>
> +            <parameter type-id='type-id-146'/>
> +            <return type-id='type-id-145'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -3383,8 +3359,8 @@
>        <class-decl name='__anonymous_struct__21' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator()'
> mangled-name='_ZNKSt14default_deleteIN5mongo14BSONObjBuilderEEclEPS1_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='70' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3394,43 +3370,43 @@
>            <function-decl
> name='__uninit_copy&lt;std::move_iterator&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; *&gt;,
> std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS5_EEES9_EET0_T_SC_SB_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='68' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-119'/>
> -            <return type-id='type-id-119'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__23' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator++'
> mangled-name='_ZNSt13move_iteratorIPSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEEEppEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='1004' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-208'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__24' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='__destroy&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; *&gt;'
> mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS4_EEEEvT_S9_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h'
> line='100' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119'/>
> -            <parameter type-id='type-id-119'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>      </namespace-decl>
>      <namespace-decl name='mongo'>
> -      <class-decl name='FTDCCollectorInterface' size-in-bits='64'
> visibility='default' is-declaration-only='yes' id='type-id-196'/>
> +      <class-decl name='FTDCCollectorInterface' size-in-bits='64'
> visibility='default' is-declaration-only='yes' id='type-id-175'/>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public'>
>            <function-decl name='add'
> mangled-name='_ZN5mongo23FTDCCollectorCollection3addESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'
> filepath='src/mongo/db/ftdc/collector.h' line='90' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo23FTDCCollectorCollection3addESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='collect'
> mangled-name='_ZN5mongo23FTDCCollectorCollection7collectEPNS_6ClientE'
> filepath='src/mongo/db/ftdc/collector.h' line='108' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo23FTDCCollectorCollection7collectEPNS_6ClientE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
> @@ -3438,48 +3414,48 @@
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONObj'
> mangled-name='_ZN5mongo7BSONObjC2Ev' filepath='src/mongo/bson/bsonobj.h'
> line='108' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONObj'
> mangled-name='_ZN5mongo7BSONObjC2EOS0_' filepath='src/mongo/bson/bsonobj.h'
> line='129' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONObj'
> mangled-name='_ZN5mongo7BSONObjC2EPKc' filepath='src/mongo/bson/bsonobj.h'
> line='120' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='init'
> mangled-name='_ZN5mongo7BSONObj4initEPKc'
> filepath='src/mongo/bson/bsonobj.h' line='555' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='objsize'
> mangled-name='_ZNK5mongo7BSONObj7objsizeEv'
> filepath='src/mongo/bson/bsonobj.h' line='361' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-13'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='isValid'
> mangled-name='_ZNK5mongo7BSONObj7isValidEv'
> filepath='src/mongo/bson/bsonobj.h' line='366' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='shareOwnershipWith'
> mangled-name='_ZNR5mongo7BSONObj18shareOwnershipWithENS_17ConstSharedBufferE'
> filepath='src/mongo/bson/bsonobj.h' line='195' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -3487,45 +3463,45 @@
>        <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='getServiceContext'
> mangled-name='_ZNK5mongo6Client17getServiceContextEv'
> filepath='src/mongo/db/client.h' line='117' column='1' visibility='default'
> binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-203'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-182'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='ServiceContext' size-in-bits='2432'
> visibility='default' is-declaration-only='yes' id='type-id-202'/>
> +      <class-decl name='ServiceContext' size-in-bits='2432'
> visibility='default' is-declaration-only='yes' id='type-id-181'/>
>        <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='StringData'
> mangled-name='_ZN5mongo10StringDataC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE'
> filepath='src/mongo/base/string_data.h' line='85' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-191'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-170'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='StringData'
> mangled-name='_ZN5mongo10StringDataC2EPKcmNS0_14TrustedInitTagE'
> filepath='src/mongo/base/string_data.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-26'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='OperationContext' size-in-bits='2176'
> visibility='default' is-declaration-only='yes' id='type-id-185'>
> +      <class-decl name='OperationContext' size-in-bits='2176'
> visibility='default' is-declaration-only='yes' id='type-id-165'>
>          <member-function access='public'>
>            <function-decl name='lockState'
> mangled-name='_ZNK5mongo16OperationContext9lockStateEv'
> filepath='src/mongo/db/operation_context.h' line='123' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-187' is-artificial='yes'/>
> -            <return type-id='type-id-200'/>
> +            <parameter type-id='type-id-167' is-artificial='yes'/>
> +            <return type-id='type-id-179'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='Locker' size-in-bits='128' visibility='default'
> is-declaration-only='yes' id='type-id-199'>
> +      <class-decl name='Locker' size-in-bits='128' visibility='default'
> is-declaration-only='yes' id='type-id-178'>
>          <member-function access='public'>
>            <function-decl
> name='setShouldConflictWithSecondaryBatchApplication'
> mangled-name='_ZN5mongo6Locker46setShouldConflictWithSecondaryBatchApplicationEb'
> filepath='src/mongo/db/concurrency/locker.h' line='323' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-200' is-artificial='yes'/>
> +            <parameter type-id='type-id-179' is-artificial='yes'/>
>              <parameter type-id='type-id-1'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -3539,7 +3515,7 @@
>        <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='ConstSharedBuffer'
> mangled-name='_ZN5mongo17ConstSharedBufferC2Ev'
> filepath='src/mongo/util/shared_buffer.h' line='171' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3547,43 +3523,43 @@
>        <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='release'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE7releaseEv'
> filepath='src/mongo/bson/util/builder.h' line='101' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> naming-typedef-id='type-id-194' visibility='default'
> is-declaration-only='yes' id='type-id-24'>
> +      <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> naming-typedef-id='type-id-173' visibility='default'
> is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='skip'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4skipEi'
> filepath='src/mongo/bson/util/builder.h' line='188' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
> -            <return type-id='type-id-59'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='reserveBytes'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE12reserveBytesEi'
> filepath='src/mongo/bson/util/builder.h' line='301' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='appendNumImpl&lt;char&gt;'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIcEEvT_'
> filepath='src/mongo/bson/util/builder.h' line='334' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-2'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEc'
> filepath='src/mongo/bson/util/builder.h' line='212' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-2'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendStr'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendStrENS_10StringDataEb'
> filepath='src/mongo/bson/util/builder.h' line='269' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-1'/>
>              <return type-id='type-id-22'/>
> @@ -3591,19 +3567,19 @@
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='len'
> mangled-name='_ZNK5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3lenEv'
> filepath='src/mongo/bson/util/builder.h' line='275' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-13'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='buf'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3bufEv'
> filepath='src/mongo/bson/util/builder.h' line='193' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <return type-id='type-id-59'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='claimReservedBytes'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE18claimReservedBytesEi'
> filepath='src/mongo/bson/util/builder.h' line='315' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -3612,9 +3588,9 @@
>        <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='fetchAndAdd'
> mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj'
> filepath='src/mongo/platform/atomic_word.h' line='120' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-174'/>
> -            <return type-id='type-id-174'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-156'/>
> +            <return type-id='type-id-156'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -3622,65 +3598,65 @@
>        <class-decl name='__anonymous_struct__11' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONObjBuilder'
> mangled-name='_ZN5mongo14BSONObjBuilderC2Ei'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='67' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilderC2Ei'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='subobjStart'
> mangled-name='_ZN5mongo14BSONObjBuilder11subobjStartENS_10StringDataE'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='233' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder11subobjStartENS_10StringDataE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-195'/>
> +            <return type-id='type-id-174'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONObjBuilder'
> mangled-name='_ZN5mongo14BSONObjBuilderC2ERNS_11_BufBuilderINS_21SharedBufferAllocatorEEE'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='80' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilderC2ERNS_11_BufBuilderINS_21SharedBufferAllocatorEEE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-195'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-174'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~BSONObjBuilder'
> mangled-name='_ZN5mongo14BSONObjBuilderD2Ev'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='165' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilderD2Ev'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='owned'
> mangled-name='_ZNK5mongo14BSONObjBuilder5ownedEv'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='758' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='done'
> mangled-name='_ZN5mongo14BSONObjBuilder4doneEv'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='677' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='obj'
> mangled-name='_ZN5mongo14BSONObjBuilder3objEv'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='665' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder3objEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='_done'
> mangled-name='_ZN5mongo14BSONObjBuilder5_doneEv'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='775' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder5_doneEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <return type-id='type-id-59'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <typedef-decl name='BufBuilder' type-id='type-id-24'
> filepath='src/mongo/bson/util/builder.h' line='365' column='1'
> id='type-id-194'/>
> +      <typedef-decl name='BufBuilder' type-id='type-id-24'
> filepath='src/mongo/bson/util/builder.h' line='365' column='1'
> id='type-id-173'/>
>        <class-decl name='__anonymous_struct__12' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeStore'
> mangled-name='_ZN5mongo8DataType7HandlerIcvE11unsafeStoreERKcPcPm'
> filepath='src/mongo/base/data_type.h' line='87' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-184'/>
> -                <parameter type-id='type-id-59'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-164'/>
> +                <parameter type-id='type-id-56'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -3690,9 +3666,9 @@
>            <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeStore'
> mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIxEEvE11unsafeStoreERKS3_PcPm'
> filepath='src/mongo/base/data_type_endian.h' line='112' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-188'/>
> -                <parameter type-id='type-id-59'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-61'/>
> +                <parameter type-id='type-id-56'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -3702,17 +3678,17 @@
>            <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeLoad'
> mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm'
> filepath='src/mongo/base/data_type.h' line='59' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-108'/>
> -                <parameter type-id='type-id-66'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-98'/>
> +                <parameter type-id='type-id-64'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeStore'
> mangled-name='_ZN5mongo8DataType7HandlerIivE11unsafeStoreERKiPcPm'
> filepath='src/mongo/base/data_type.h' line='87' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-76'/>
> -                <parameter type-id='type-id-59'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-74'/>
> +                <parameter type-id='type-id-56'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -3722,9 +3698,9 @@
>            <class-decl name='__anonymous_struct__3' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeLoad'
> mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIyEEvE10unsafeLoadEPS3_PKcPm'
> filepath='src/mongo/base/data_type_endian.h' line='86' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-113'/>
> -                <parameter type-id='type-id-66'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-55'/>
> +                <parameter type-id='type-id-64'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -3732,49 +3708,49 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeStore&lt;char&gt;'
> mangled-name='_ZN5mongo8DataType11unsafeStoreIcEEvRKT_PcPm'
> filepath='src/mongo/base/data_type.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-184'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-164'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='unsafeStore&lt;mongo::LittleEndian&lt;char&gt; &gt;'
> mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIcEEEEvRKT_PcPm'
> filepath='src/mongo/base/data_type.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-188'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeLoad&lt;int&gt;'
> mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm'
> filepath='src/mongo/base/data_type.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-108'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-98'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='unsafeLoad&lt;mongo::LittleEndian&lt;int&gt; &gt;'
> mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIiEEEEvPT_PKcPm'
> filepath='src/mongo/base/data_type.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeStore&lt;int&gt;'
> mangled-name='_ZN5mongo8DataType11unsafeStoreIiEEvRKT_PcPm'
> filepath='src/mongo/base/data_type.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-76'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-74'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='unsafeStore&lt;mongo::LittleEndian&lt;int&gt; &gt;'
> mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIiEEEEvRKT_PcPm'
> filepath='src/mongo/base/data_type.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-188'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3783,37 +3759,37 @@
>        <class-decl name='__anonymous_struct__14' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <class-decl name='__anonymous_struct__15' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='bytes_type' type-id='type-id-59'
> filepath='src/mongo/base/data_view.h' line='71' column='1'
> id='type-id-214'/>
> +          <typedef-decl name='bytes_type' type-id='type-id-56'
> filepath='src/mongo/base/data_view.h' line='71' column='1'
> id='type-id-189'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='write&lt;mongo::LittleEndian&lt;char&gt;
> &gt;'
> mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIcEEEERS0_RKT_m'
> filepath='src/mongo/base/data_view.h' line='82' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-47'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='write&lt;mongo::LittleEndian&lt;int&gt;
> &gt;'
> mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIiEEEERS0_RKT_m'
> filepath='src/mongo/base/data_view.h' line='82' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-47'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__16' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='read&lt;mongo::LittleEndian&lt;int&gt;
> &gt;'
> mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIiEEEERKS0_PT_m'
> filepath='src/mongo/base/data_view.h' line='50' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <parameter type-id='type-id-26'/>
> -            <return type-id='type-id-188'/>
> +            <return type-id='type-id-61'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='read&lt;mongo::LittleEndian&lt;int&gt;
> &gt;'
> mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIiEEEET_m'
> filepath='src/mongo/base/data_view.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
> @@ -3821,13 +3797,13 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__17' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-215'>
> +          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-190'>
>              <underlying-type type-id='type-id-18'/>
>            </enum-decl>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='got'
> mangled-name='_ZN5mongo15BSONSizeTracker3gotEi'
> filepath='src/mongo/bson/bsonmisc.h' line='258' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -3835,19 +3811,19 @@
>        </class-decl>
>      </namespace-decl>
>      <namespace-decl name='__gnu_cxx'>
> -      <class-decl name='__anonymous_struct__' is-anonymous='yes'
> naming-typedef-id='type-id-210' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> -      <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> naming-typedef-id='type-id-211' visibility='default'
> is-declaration-only='yes' id='type-id-24'>
> +      <class-decl name='__anonymous_struct__' is-anonymous='yes'
> naming-typedef-id='type-id-185' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> naming-typedef-id='type-id-186' visibility='default'
> is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public'>
>            <function-decl name='__normal_iterator'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EESt6vectorIS6_SaIS6_EEEC2ERKS7_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='740' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-206'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-162'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator++'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo7BSONObjESt6vectorIS2_SaIS2_EEEppEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='761' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <return type-id='type-id-179'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -3859,9 +3835,9 @@
>        <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='construct&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt;,
> std::unique_ptr&lt;mongo::FTDCCollectorInterface,
> std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EEE9constructIS6_JS6_EEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-119'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -3870,113 +3846,108 @@
>        <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>      </namespace-decl>
>      <function-decl name='wcsftime' filepath='/usr/include/wchar.h'
> line='858' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-138'/>
> +      <parameter type-id='type-id-121'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-101'/>
> -      <parameter type-id='type-id-182'/>
> +      <parameter type-id='type-id-91'/>
> +      <parameter type-id='type-id-163'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='clock' filepath='/usr/include/time.h' line='189'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <return type-id='type-id-176'/>
> +      <return type-id='type-id-158'/>
>      </function-decl>
>      <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-178'/>
> -      <parameter type-id='type-id-178'/>
> +      <parameter type-id='type-id-160'/>
> +      <parameter type-id='type-id-160'/>
>        <return type-id='type-id-11'/>
>      </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-53'/>
> -      <return type-id='type-id-178'/>
> +      <parameter type-id='type-id-55'/>
> +      <return type-id='type-id-160'/>
>      </function-decl>
>      <function-decl name='time' filepath='/usr/include/time.h' line='192'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-209'/>
> -      <return type-id='type-id-178'/>
> +      <parameter type-id='type-id-184'/>
> +      <return type-id='type-id-160'/>
>      </function-decl>
>      <function-decl name='asctime' filepath='/usr/include/time.h'
> line='261' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-181'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-62'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='ctime' filepath='/usr/include/time.h' line='264'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -      <parameter type-id='type-id-193'/>
> -      <return type-id='type-id-59'/>
> +      <parameter type-id='type-id-172'/>
> +      <return type-id='type-id-56'/>
>      </function-decl>
>      <function-decl name='gmtime' filepath='/usr/include/time.h'
> line='239' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-193'/>
> -      <return type-id='type-id-53'/>
> +      <parameter type-id='type-id-172'/>
> +      <return type-id='type-id-55'/>
>      </function-decl>
>      <function-decl name='localtime' filepath='/usr/include/time.h'
> line='243' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-193'/>
> -      <return type-id='type-id-53'/>
> +      <parameter type-id='type-id-172'/>
> +      <return type-id='type-id-55'/>
>      </function-decl>
>      <function-decl name='strftime' filepath='/usr/include/time.h'
> line='205' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-60'/>
> +      <parameter type-id='type-id-57'/>
>        <parameter type-id='type-id-26'/>
> -      <parameter type-id='type-id-67'/>
> -      <parameter type-id='type-id-182'/>
> +      <parameter type-id='type-id-65'/>
> +      <parameter type-id='type-id-163'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>      <function-decl name='strnlen' filepath='/usr/include/string.h'
> line='401' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -      <parameter type-id='type-id-66'/>
> +      <parameter type-id='type-id-64'/>
>        <parameter type-id='type-id-26'/>
>        <return type-id='type-id-26'/>
>      </function-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='src/mongo/db/ftdc/compressor.cpp'
> comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb'
> language='LANG_C_plus_plus'>
> -    <typedef-decl name='is_not_reference_tag' type-id='type-id-216'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='219' column='1' id='type-id-217'/>
> -    <typedef-decl name='uint32_t' type-id='type-id-20'
> filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-218'/>
> -    <typedef-decl name='uint64_t' type-id='type-id-21'
> filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-219'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-220'
> size-in-bits='64' id='type-id-221'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-1'
> size-in-bits='64' id='type-id-222'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-223'/>
> -    <qualified-type-def type-id='type-id-24' const='yes'
> id='type-id-224'/>
> -    <pointer-type-def type-id='type-id-224' size-in-bits='64'
> id='type-id-225'/>
> -    <qualified-type-def type-id='type-id-20' const='yes'
> id='type-id-226'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-226'
> size-in-bits='64' id='type-id-227'/>
> -    <qualified-type-def type-id='type-id-21' const='yes'
> id='type-id-228'/>
> -    <pointer-type-def type-id='type-id-228' size-in-bits='64'
> id='type-id-229'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-230'
> size-in-bits='64' id='type-id-231'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-232'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-233'/>
> -    <pointer-type-def type-id='type-id-21' size-in-bits='64'
> id='type-id-234'/>
> +    <typedef-decl name='is_not_reference_tag' type-id='type-id-191'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='219' column='1' id='type-id-192'/>
> +    <typedef-decl name='uint32_t' type-id='type-id-20'
> filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-193'/>
> +    <typedef-decl name='uint64_t' type-id='type-id-21'
> filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-194'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-195'
> size-in-bits='64' id='type-id-196'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-1'
> size-in-bits='64' id='type-id-197'/>
> +    <qualified-type-def type-id='type-id-20' const='yes'
> id='type-id-198'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-198'
> size-in-bits='64' id='type-id-199'/>
> +    <qualified-type-def type-id='type-id-21' const='yes'
> id='type-id-200'/>
> +    <pointer-type-def type-id='type-id-200' size-in-bits='64'
> id='type-id-201'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-202'
> size-in-bits='64' id='type-id-203'/>
> +    <pointer-type-def type-id='type-id-21' size-in-bits='64'
> id='type-id-204'/>
>      <namespace-decl name='boost'>
>        <namespace-decl name='optional_detail'>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='protected'>
>              <function-decl name='destroy'
> mangled-name='_ZN5boost15optional_detail13optional_baseIbE7destroyEv'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='704' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='protected' destructor='yes'>
>              <function-decl name='~optional_base'
> mangled-name='_ZN5boost15optional_detail13optional_baseIbED2Ev'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='327' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private'>
>              <function-decl name='destroy_impl'
> mangled-name='_ZN5boost15optional_detail13optional_baseIbE12destroy_implEN4mpl_5bool_ILb0EEE'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='745' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <parameter type-id='type-id-217'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-192'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes'>
>              <function-decl name='is_initialized'
> mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEE14is_initializedEv'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='468' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-225' is-artificial='yes'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>          <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-type access='public'>
> -            <typedef-decl name='reference_type' type-id='type-id-222'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='150' column='1' id='type-id-235'/>
> +            <typedef-decl name='reference_type' type-id='type-id-197'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='150' column='1' id='type-id-205'/>
>            </member-type>
>          </class-decl>
>          <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='protected'>
>              <function-decl name='optional_base'
> mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEEC2EOS8_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='292' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <parameter type-id='type-id-223'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-54'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -3992,8 +3963,8 @@
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='optional'
> mangled-name='_ZN5boost8optionalISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS3_EEEC2EOS7_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='870' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4001,18 +3972,18 @@
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='reference_type' type-id='type-id-235'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='774' column='1' id='type-id-236'/>
> +          <typedef-decl name='reference_type' type-id='type-id-205'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='774' column='1' id='type-id-206'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='get'
> mangled-name='_ZN5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEE3getEv'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='1025' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <return type-id='type-id-236'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-206'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator*'
> mangled-name='_ZNR5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEEdeEv'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='1042' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <return type-id='type-id-236'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-206'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -4026,42 +3997,42 @@
>        <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::ConstDataRange &amp;,
> mongo::FTDCCompressor::CompressorState, mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt5tupleIJN5mongo14ConstDataRangeENS0_14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IJRS1_S3_RS4_EvEEDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='479' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> -            <parameter type-id='type-id-231'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
> +            <parameter type-id='type-id-203'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple'
> mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2EOS5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='484' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='reference' type-id='type-id-238'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='229' column='1' id='type-id-237'/>
> +          <typedef-decl name='reference' type-id='type-id-208'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='229' column='1' id='type-id-207'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='swap' mangled-name='_ZNSt6thread4swapERS_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1194' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-208'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator[]'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEixEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='779' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
> -            <return type-id='type-id-237'/>
> +            <return type-id='type-id-207'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='clear'
> mangled-name='_ZNSt6vectorImSaImEE5clearEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4071,8 +4042,8 @@
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='_M_swap_data'
> mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE12_Vector_impl12_M_swap_dataERS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='101' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-233' is-artificial='yes'/>
> -                <parameter type-id='type-id-232'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
> +                <parameter type-id='type-id-53'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -4081,19 +4052,19 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__5' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='rebind_alloc&lt;unsigned long&gt;'
> type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-239'/>
> +          <typedef-decl name='rebind_alloc&lt;unsigned long&gt;'
> type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-209'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-21'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='447' column='1' id='type-id-240'/>
> +          <typedef-decl name='value_type' type-id='type-id-21'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='447' column='1' id='type-id-210'/>
>          </member-type>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> naming-typedef-id='type-id-239' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> naming-typedef-id='type-id-209' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::ConstDataRange,
> mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt5tupleIJN5mongo14ConstDataRangeENS0_6Date_tEEEC2IS1_RS2_vEEOT_OT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='612' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4102,8 +4073,8 @@
>        <class-decl name='__anonymous_struct__9' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl'
> mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2EOS5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='367' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4111,9 +4082,9 @@
>        <class-decl name='__anonymous_struct__10' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Tuple_impl&lt;mongo::FTDCCompressor::CompressorState, mongo::Date_t
> &amp;, void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IS2_JRS3_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-231'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-203'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4121,10 +4092,10 @@
>        <class-decl name='__anonymous_struct__11' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::ConstDataRange
> &amp;, mongo::FTDCCompressor::CompressorState, mongo::Date_t &amp;,
> void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo14ConstDataRangeENS0_14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IRS1_JS3_RS4_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> -            <parameter type-id='type-id-231'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
> +            <parameter type-id='type-id-203'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4132,8 +4103,8 @@
>        <class-decl name='__anonymous_struct__12' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Head_base&lt;mongo::FTDCCompressor::CompressorState&gt;'
> mangled-name='_ZNSt10_Head_baseILm1EN5mongo14FTDCCompressor15CompressorStateELb0EEC2IS2_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-231'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-203'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4141,8 +4112,8 @@
>        <class-decl name='__anonymous_struct__13' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Head_base&lt;mongo::ConstDataRange&gt;'
> mangled-name='_ZNSt10_Head_baseILm0EN5mongo14ConstDataRangeELb0EEC2IS1_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4153,22 +4124,22 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator bool'
> mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEcvbEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='318' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='reset'
> mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EE5resetEPS1_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='339' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-159'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-141'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator='
> mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEaSEOS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='249' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> -            <return type-id='type-id-208'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -4177,9 +4148,9 @@
>        <class-decl name='__anonymous_struct__17' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::ConstDataRange,
> mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo14ConstDataRangeENS0_6Date_tEEEC2IS1_JRS2_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4188,19 +4159,19 @@
>        <class-decl name='__anonymous_struct__19' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__uninit_default_n&lt;unsigned long *,
> unsigned long&gt;'
> mangled-name='_ZNSt27__uninitialized_default_n_1ILb1EE18__uninit_default_nIPmmEET_S3_T0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='535' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-234'/>
> +            <parameter type-id='type-id-204'/>
>              <parameter type-id='type-id-21'/>
> -            <return type-id='type-id-234'/>
> +            <return type-id='type-id-204'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__20' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__copy_m&lt;unsigned long&gt;'
> mangled-name='_ZNSt11__copy_moveILb1ELb1ESt26random_access_iterator_tagE8__copy_mImEEPT_PKS3_S6_S4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h'
> line='373' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-229'/>
> -            <parameter type-id='type-id-229'/>
> -            <parameter type-id='type-id-234'/>
> -            <return type-id='type-id-234'/>
> +            <parameter type-id='type-id-201'/>
> +            <parameter type-id='type-id-201'/>
> +            <parameter type-id='type-id-204'/>
> +            <return type-id='type-id-204'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -4209,8 +4180,8 @@
>            <function-decl
> name='__uninit_copy&lt;std::move_iterator&lt;unsigned long *&gt;, unsigned
> long *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb1EE13__uninit_copyISt13move_iteratorIPmES3_EET0_T_S6_S5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='91' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-234'/>
> -            <return type-id='type-id-234'/>
> +            <parameter type-id='type-id-204'/>
> +            <return type-id='type-id-204'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -4220,34 +4191,34 @@
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public'>
>            <function-decl name='objdata'
> mangled-name='_ZNK5mongo7BSONObj7objdataEv'
> filepath='src/mongo/bson/bsonobj.h' line='356' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-66'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-64'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='isEmpty'
> mangled-name='_ZNK5mongo7BSONObj7isEmptyEv'
> filepath='src/mongo/bson/bsonobj.h' line='378' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='swap'
> mangled-name='_ZN5mongo17ConstSharedBuffer4swapERS0_'
> filepath='src/mongo/bson/bsonobj.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator='
> mangled-name='_ZN5mongo7BSONObjaSES0_' filepath='src/mongo/bson/bsonobj.h'
> line='144' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONObj'
> mangled-name='_ZN5mongo7BSONObjC2ERKS0_'
> filepath='src/mongo/bson/bsonobj.h' line='139' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4255,14 +4226,14 @@
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='isOK'
> mangled-name='_ZNK5mongo6Status4isOKEv'
> filepath='src/mongo/base/status_with.h' line='108' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='getValue'
> mangled-name='_ZN5mongo10StatusWithIbE8getValueEv'
> filepath='src/mongo/base/status_with.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <return type-id='type-id-222'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-197'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -4272,41 +4243,41 @@
>          </member-type>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~Status'
> mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h'
> line='87' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='unref'
> mangled-name='_ZN5mongo6Status5unrefEPNS0_9ErrorInfoE'
> filepath='src/mongo/base/status.h' line='181' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-115'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='ref'
> mangled-name='_ZN5mongo6Status3refEPNS0_9ErrorInfoE'
> filepath='src/mongo/base/status.h' line='180' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-115'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='Status'
> mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h'
> line='81' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='Status'
> mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h'
> line='84' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator='
> mangled-name='_ZN5mongo6StatusaSEOS0_' filepath='src/mongo/base/status.h'
> line='85' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> -            <return type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -4315,43 +4286,43 @@
>        <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-230'>
> +          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-202'>
>              <underlying-type type-id='type-id-18'/>
>            </enum-decl>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='getArrayOffset'
> mangled-name='_ZN5mongo14FTDCCompressor14getArrayOffsetEjjj'
> filepath='src/mongo/db/ftdc/compressor.h' line='140' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-218'/>
> -            <parameter type-id='type-id-218'/>
> -            <parameter type-id='type-id-218'/>
> +            <parameter type-id='type-id-193'/>
> +            <parameter type-id='type-id-193'/>
> +            <parameter type-id='type-id-193'/>
>              <return type-id='type-id-26'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='addSample'
> mangled-name='_ZN5mongo14FTDCCompressor9addSampleERKNS_7BSONObjENS_6Date_tE'
> filepath='src/mongo/db/ftdc/compressor.h' line='95' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCCompressor9addSampleERKNS_7BSONObjENS_6Date_tE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='_reset'
> mangled-name='_ZN5mongo14FTDCCompressor6_resetERKNS_7BSONObjENS_6Date_tE'
> filepath='src/mongo/db/ftdc/compressor.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCCompressor6_resetERKNS_7BSONObjENS_6Date_tE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='getCompressedSamples'
> mangled-name='_ZN5mongo14FTDCCompressor20getCompressedSamplesEv'
> filepath='src/mongo/db/ftdc/compressor.h' line='128' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCCompressor20getCompressedSamplesEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='reset'
> mangled-name='_ZN5mongo14FTDCCompressor5resetEv'
> filepath='src/mongo/db/ftdc/compressor.h' line='135' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCCompressor5resetEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4360,8 +4331,8 @@
>        <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='getValue'
> mangled-name='_ZN5mongo10StatusWithISt5tupleIJNS_14ConstDataRangeENS_6Date_tEEEE8getValueEv'
> filepath='src/mongo/base/status_with.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <return type-id='type-id-208'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -4374,29 +4345,29 @@
>        <class-decl name='__anonymous_struct__11' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='setlen'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE6setlenEi'
> filepath='src/mongo/bson/util/builder.h' line='278' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendBuf'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendBufEPKvm'
> filepath='src/mongo/bson/util/builder.h' line='259' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-135'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-118'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='appendNumImpl&lt;unsigned int&gt;'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIjEEvT_'
> filepath='src/mongo/bson/util/builder.h' line='334' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-20'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEj'
> filepath='src/mongo/bson/util/builder.h' line='223' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-20'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -4413,9 +4384,9 @@
>            <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeStore'
> mangled-name='_ZN5mongo8DataType7HandlerIjvE11unsafeStoreERKjPcPm'
> filepath='src/mongo/base/data_type.h' line='87' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-227'/>
> -                <parameter type-id='type-id-59'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-199'/>
> +                <parameter type-id='type-id-56'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -4426,27 +4397,27 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeStore&lt;unsigned int&gt;'
> mangled-name='_ZN5mongo8DataType11unsafeStoreIjEEvRKT_PcPm'
> filepath='src/mongo/base/data_type.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-227'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-199'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='unsafeStore&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;'
> mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIjEEEEvRKT_PcPm'
> filepath='src/mongo/base/data_type.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-188'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='store&lt;mongo::FTDCVarInt&gt;'
> mangled-name='_ZN5mongo8DataType5storeINS_10FTDCVarIntEEENS_6StatusERKT_PcmPml'
> filepath='src/mongo/base/data_type.h' line='144' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-188'/>
> -            <parameter type-id='type-id-59'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-56'/>
>              <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-204'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-183'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
> @@ -4454,8 +4425,8 @@
>        <class-decl name='__anonymous_struct__13' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='FTDCVarInt'
> mangled-name='_ZN5mongo10FTDCVarIntC2Em'
> filepath='src/mongo/db/ftdc/varint.h' line='53' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-219'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-194'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4465,10 +4436,10 @@
>        <class-decl name='__anonymous_struct__16' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='write&lt;mongo::LittleEndian&lt;unsigned
> int&gt; &gt;'
> mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIjEEEERS0_RKT_m'
> filepath='src/mongo/base/data_view.h' line='82' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-47'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -4477,8 +4448,8 @@
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='operator()'
> mangled-name='_ZN5mongo11DataBuilder7FreeBufclEPc'
> filepath='src/mongo/base/data_builder.h' line='56' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-115' is-artificial='yes'/>
> -                <parameter type-id='type-id-59'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
> +                <parameter type-id='type-id-56'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -4486,53 +4457,53 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='DataBuilder'
> mangled-name='_ZN5mongo11DataBuilderC2Em'
> filepath='src/mongo/base/data_builder.h' line='69' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='getCursor'
> mangled-name='_ZN5mongo11DataBuilder9getCursorEv'
> filepath='src/mongo/base/data_builder.h' line='132' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='size'
> mangled-name='_ZNK5mongo11DataBuilder4sizeEv'
> filepath='src/mongo/base/data_builder.h' line='147' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-47'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='_ensureStorage'
> mangled-name='_ZN5mongo11DataBuilder14_ensureStorageEv'
> filepath='src/mongo/base/data_builder.h' line='247' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl
> name='_getSerializedSize&lt;mongo::FTDCVarInt&gt;'
> mangled-name='_ZN5mongo11DataBuilder18_getSerializedSizeINS_10FTDCVarIntEEEmRKT_'
> filepath='src/mongo/base/data_builder.h' line='235' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-47'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='reserve'
> mangled-name='_ZN5mongo11DataBuilder7reserveEm'
> filepath='src/mongo/base/data_builder.h' line='192' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='writeAndAdvance&lt;mongo::FTDCVarInt&gt;'
> mangled-name='_ZN5mongo11DataBuilder15writeAndAdvanceINS_10FTDCVarIntEEENS_6StatusERKT_'
> filepath='src/mongo/base/data_builder.h' line='110' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11DataBuilder15writeAndAdvanceINS_10FTDCVarIntEEENS_6StatusERKT_'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='resize'
> mangled-name='_ZN5mongo11DataBuilder6resizeEm'
> filepath='src/mongo/base/data_builder.h' line='166' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo11DataBuilder6resizeEm'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -4541,18 +4512,18 @@
>        <class-decl name='__anonymous_struct__18' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='getValue'
> mangled-name='_ZN5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEE8getValueEv'
> filepath='src/mongo/base/status_with.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <return type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__19' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='DataRange'
> mangled-name='_ZN5mongo9DataRangeC2EPcS1_l'
> filepath='src/mongo/base/data_range.h' line='115' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-214'/>
> -            <parameter type-id='type-id-214'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-189'/>
> +            <parameter type-id='type-id-189'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4560,10 +4531,10 @@
>        <class-decl name='__anonymous_struct__20' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='DataRangeCursor'
> mangled-name='_ZN5mongo15DataRangeCursorC2EPcS1_l'
> filepath='src/mongo/base/data_range_cursor.h' line='105' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4571,17 +4542,17 @@
>        <class-decl name='__anonymous_struct__21' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>      </namespace-decl>
>      <namespace-decl name='mpl_'>
> -      <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' naming-typedef-id='type-id-216' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> -      <typedef-decl name='false_' type-id='type-id-24'
> filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25'
> column='1' id='type-id-216'/>
> +      <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' naming-typedef-id='type-id-191' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <typedef-decl name='false_' type-id='type-id-24'
> filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25'
> column='1' id='type-id-191'/>
>      </namespace-decl>
>      <namespace-decl name='__gnu_cxx'>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='reference' type-id='type-id-221'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='109' column='1' id='type-id-238'/>
> +          <typedef-decl name='reference' type-id='type-id-196'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='109' column='1' id='type-id-208'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='value_type' type-id='type-id-240'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='103' column='1' id='type-id-220'/>
> +          <typedef-decl name='value_type' type-id='type-id-210'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='103' column='1' id='type-id-195'/>
>          </member-type>
>          <member-type access='public'>
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
> @@ -4591,52 +4562,39 @@
>      </namespace-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='src/mongo/db/ftdc/controller.cpp'
> comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb'
> language='LANG_C_plus_plus'>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='832'
> id='type-id-241'>
> -      <subrange length='104' type-id='type-id-5' id='type-id-242'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='832'
> id='type-id-211'>
> +      <subrange length='104' type-id='type-id-5' id='type-id-212'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='288'
> id='type-id-243'>
> -      <subrange length='36' type-id='type-id-5' id='type-id-244'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='288'
> id='type-id-213'>
> +      <subrange length='36' type-id='type-id-5' id='type-id-214'/>
>      </array-type-def>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-245'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-246'/>
> -    <qualified-type-def type-id='type-id-24' const='yes'
> id='type-id-247'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-247'
> size-in-bits='64' id='type-id-248'/>
> -    <pointer-type-def type-id='type-id-247' size-in-bits='64'
> id='type-id-249'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-241'
> size-in-bits='64' id='type-id-250'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-243'
> size-in-bits='64' id='type-id-251'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-85'
> size-in-bits='64' id='type-id-252'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-88'
> size-in-bits='64' id='type-id-153'/>
> -    <qualified-type-def type-id='type-id-24' const='yes'
> id='type-id-253'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-253'
> size-in-bits='64' id='type-id-254'/>
> -    <qualified-type-def type-id='type-id-255' const='yes'
> id='type-id-256'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-256'
> size-in-bits='64' id='type-id-257'/>
> -    <pointer-type-def type-id='type-id-256' size-in-bits='64'
> id='type-id-258'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-113'
> size-in-bits='64' id='type-id-259'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-260'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-261'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-262'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-263'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-264'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-265'
> size-in-bits='64' id='type-id-266'/>
> -    <pointer-type-def type-id='type-id-267' size-in-bits='64'
> id='type-id-268'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-269'
> size-in-bits='64' id='type-id-270'/>
> -    <pointer-type-def type-id='type-id-269' size-in-bits='64'
> id='type-id-271'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-87'
> size-in-bits='64' id='type-id-154'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-272'
> size-in-bits='64' id='type-id-273'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-55'
> size-in-bits='64' id='type-id-215'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-211'
> size-in-bits='64' id='type-id-216'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-213'
> size-in-bits='64' id='type-id-217'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-78'
> size-in-bits='64' id='type-id-135'/>
> +    <qualified-type-def type-id='type-id-218' const='yes'
> id='type-id-219'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-219'
> size-in-bits='64' id='type-id-220'/>
> +    <pointer-type-def type-id='type-id-219' size-in-bits='64'
> id='type-id-221'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-222'
> size-in-bits='64' id='type-id-223'/>
> +    <pointer-type-def type-id='type-id-224' size-in-bits='64'
> id='type-id-225'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-226'
> size-in-bits='64' id='type-id-227'/>
> +    <pointer-type-def type-id='type-id-226' size-in-bits='64'
> id='type-id-228'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-77'
> size-in-bits='64' id='type-id-136'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-229'
> size-in-bits='64' id='type-id-230'/>
>      <namespace-decl name='boost'>
>        <namespace-decl name='filesystem'>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='empty'
> mangled-name='_ZNK5boost10filesystem4path5emptyEv'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='511' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-249' is-artificial='yes'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator='
> mangled-name='_ZN5boost10filesystem4pathaSERKS1_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='190' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-248'/>
> -              <return type-id='type-id-245'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-61'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -4650,21 +4608,21 @@
>      </namespace-decl>
>      <namespace-decl name='std'>
>        <namespace-decl name='__cxx11'>
> -        <class-decl name='basic_ostringstream&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='3008' visibility='default' is-declaration-only='yes'
> id='type-id-269'/>
> +        <class-decl name='basic_ostringstream&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> size-in-bits='3008' visibility='default' is-declaration-only='yes'
> id='type-id-226'/>
>        </namespace-decl>
>        <namespace-decl name='chrono'>
>          <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>          <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl name='__cast&lt;long, std::ratio&lt;1,
> 1000000000&gt; &gt;'
> mangled-name='_ZNSt6chrono20__duration_cast_implINS_8durationIlSt5ratioILl1ELl1EEEES2_ILl1ELl1000000000EElLb1ELb0EE6__castIlS5_EES4_RKNS1_IT_T0_EE'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/chrono'
> line='159' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-254'/>
> +              <parameter type-id='type-id-61'/>
>                <return type-id='type-id-24'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>          <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-type access='public'>
> -            <typedef-decl name='rep' type-id='type-id-15'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/chrono'
> line='243' column='1' id='type-id-274'/>
> +            <typedef-decl name='rep' type-id='type-id-15'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/chrono'
> line='243' column='1' id='type-id-231'/>
>            </member-type>
>          </class-decl>
>          <class-decl name='__anonymous_struct__3' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
> @@ -4672,30 +4630,30 @@
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public'>
>            <function-decl name='__shared_count'
> mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='565' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~__shared_count'
> mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='656' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl
> name='__shared_count&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;,
> std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;'
> mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2INSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPSA_EEvEEEESaISJ_EJSI_EEESt19_Sp_make_shared_tagPT_RKT0_DpOT1_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='609' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-233'/>
> -            <parameter type-id='type-id-252'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='_M_swap'
> mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE7_M_swapERS2_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='685' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-208'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4706,26 +4664,26 @@
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='_Impl'
> mangled-name='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEEC2EOSD_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='111' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-233' is-artificial='yes'/>
> -                <parameter type-id='type-id-207'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
> +                <parameter type-id='type-id-54'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' static='yes'
> vtable-offset='2'>
>                <function-decl name='_M_run'
> mangled-name='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEE6_M_runEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='115' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEE6_M_runEv'>
> -                <parameter type-id='type-id-233' is-artificial='yes'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' static='yes'
> destructor='yes' vtable-offset='0'>
>                <function-decl name='~_Impl_base'
> mangled-name='_ZNSt6thread10_Impl_baseD0Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='101' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='_ZNSt6thread10_Impl_baseD0Ev'>
> -                <parameter type-id='type-id-233' is-artificial='yes'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' static='yes'
> destructor='yes' vtable-offset='0'>
>                <function-decl name='~_Impl_base'
> mangled-name='_ZNSt6thread10_Impl_baseD2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='101' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='_ZNSt6thread10_Impl_baseD2Ev'>
> -                <parameter type-id='type-id-233' is-artificial='yes'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -4735,7 +4693,7 @@
>            <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='id' mangled-name='_ZNSt6thread2idC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='73' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-233' is-artificial='yes'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -4747,70 +4705,70 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='joinable'
> mangled-name='_ZNKSt6thread8joinableEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='169' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl
> name='_M_make_routine&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;'
> mangled-name='_ZNSt6thread15_M_make_routineISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEEESt10shared_ptrINS_5_ImplIT_EEEOSG_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='201' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='thread&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;&gt;'
> mangled-name='_ZNSt6threadC2ISt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS4_EEJEEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread'
> line='133' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6threadC2ISt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS4_EEJEEEOT_DpOT0_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__3' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='result_type' type-id='type-id-276'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1505' column='1' id='type-id-275'/>
> +          <typedef-decl name='result_type' type-id='type-id-233'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1505' column='1' id='type-id-232'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;&gt;'
> mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEC2IS9_JEEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1509' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Bind_simple'
> mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEC2EOSB_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1514' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='_M_invoke&lt;&gt;'
> mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEE9_M_invokeIJEEEvSt12_Index_tupleIJXspT_EEE'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1526' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-276'/>
> +            <return type-id='type-id-233'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator()'
> mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEclEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1517' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-275'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-232'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__4' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='type' type-id='type-id-22'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits'
> line='158' column='1' id='type-id-276'/>
> +          <typedef-decl name='type' type-id='type-id-22'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits'
> line='158' column='1' id='type-id-233'/>
>          </member-type>
>        </class-decl>
>        <class-decl name='__anonymous_struct__5' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='private' static='yes'>
>            <function-decl
> name='shared_ptr&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;'
> mangled-name='_ZNSt10shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEC2ISaISF_EJSE_EEESt19_Sp_make_shared_tagRKT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h'
> line='317' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-252'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4819,45 +4777,45 @@
>          <member-type access='private'>
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-type access='public'>
> -              <typedef-decl name='other' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/allocator.h'
> line='105' column='1' id='type-id-277'/>
> +              <typedef-decl name='other' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/allocator.h'
> line='105' column='1' id='type-id-234'/>
>              </member-type>
>            </class-decl>
>          </member-type>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> naming-typedef-id='type-id-277' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> naming-typedef-id='type-id-234' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
>        <function-decl
> name='__enable_shared_from_this_helper&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;'
> mangled-name='_ZSt32__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEvRKSt14__shared_countIXT_EEz'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='862' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZSt32__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEvRKSt14__shared_countIXT_EEz'>
> -        <parameter type-id='type-id-252'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='862' column='1'/>
> +        <parameter type-id='type-id-61'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='862' column='1'/>
>          <parameter is-variadic='yes'/>
>          <return type-id='type-id-22'/>
>        </function-decl>
> -      <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> naming-typedef-id='type-id-265' visibility='default'
> is-declaration-only='yes' id='type-id-24'>
> +      <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> naming-typedef-id='type-id-222' visibility='default'
> is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='lock'
> mangled-name='_ZNSt11unique_lockISt5mutexE4lockEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex'
> line='133' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unlock'
> mangled-name='_ZNSt11unique_lockISt5mutexE6unlockEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex'
> line='150' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='mutex_type' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex'
> line='383' column='1' id='type-id-265'/>
> +          <typedef-decl name='mutex_type' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex'
> line='383' column='1' id='type-id-222'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='lock_guard'
> mangled-name='_ZNSt10lock_guardISt5mutexEC2ERS0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex'
> line='385' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-266'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-223'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~lock_guard'
> mangled-name='_ZNSt10lock_guardISt5mutexED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex'
> line='391' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4879,52 +4837,52 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator*'
> mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEdeEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h'
> line='288' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <return type-id='type-id-276'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-233'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__19' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
> -      <class-decl name='basic_ostream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default'
> is-declaration-only='yes' id='type-id-278'>
> +      <class-decl name='basic_ostream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default'
> is-declaration-only='yes' id='type-id-235'>
>          <member-type access='private'>
> -          <typedef-decl name='__ostream_type' type-id='type-id-278'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream'
> line='71' column='1' id='type-id-279'/>
> +          <typedef-decl name='__ostream_type' type-id='type-id-235'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream'
> line='71' column='1' id='type-id-236'/>
>          </member-type>
>          <member-function access='public'>
>            <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream'
> line='170' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-280' is-artificial='yes'/>
> +            <parameter type-id='type-id-237' is-artificial='yes'/>
>              <parameter type-id='type-id-21'/>
> -            <return type-id='type-id-281'/>
> +            <return type-id='type-id-238'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <typedef-decl name='ostream' type-id='type-id-278'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/iosfwd'
> line='141' column='1' id='type-id-272'/>
> +      <typedef-decl name='ostream' type-id='type-id-235'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/iosfwd'
> line='141' column='1' id='type-id-229'/>
>        <class-decl name='__anonymous_struct__20' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Bind&lt;mongo::FTDCController *&gt;'
> mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EEC2IJS6_EEEOS5_DpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1113' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> -            <parameter type-id='type-id-259'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-215'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Bind'
> mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EEC2EOS8_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='__call&lt;void, 0&gt;'
> mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EE6__callIvJEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1071' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator()&lt;, void&gt;'
> mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EEclIJEvEET0_DpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='1129' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4935,8 +4893,8 @@
>        <class-decl name='__anonymous_struct__24' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Head_base&lt;mongo::FTDCController *&gt;'
> mangled-name='_ZNSt10_Head_baseILm0EPN5mongo14FTDCControllerELb0EEC2IS2_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-259'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-215'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4944,8 +4902,8 @@
>        <class-decl name='__anonymous_struct__25' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::FTDCController
> *&gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo14FTDCControllerEEEC2IS2_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='361' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-259'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-215'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4953,8 +4911,8 @@
>        <class-decl name='__anonymous_struct__26' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::FTDCController *,
> void&gt;'
> mangled-name='_ZNSt5tupleIJPN5mongo14FTDCControllerEEEC2IJS2_EvEEDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='479' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-259'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-215'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4962,13 +4920,13 @@
>        <class-decl name='__anonymous_struct__27' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__shared_ptr'
> mangled-name='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EEC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='876' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~__shared_ptr'
> mangled-name='_ZNSt12__shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEELN9__gnu_cxx12_Lock_policyE2EED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='925' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4976,7 +4934,7 @@
>        <class-decl name='__anonymous_struct__28' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='shared_ptr'
> mangled-name='_ZNSt10shared_ptrINSt6thread10_Impl_baseEEC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h'
> line='104' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4984,13 +4942,13 @@
>        <class-decl name='__anonymous_struct__29' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_M_release'
> mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='143' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Sp_counted_base'
> mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EEC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='112' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -4998,32 +4956,32 @@
>        <class-decl name='__anonymous_struct__30' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='private' static='yes'>
>            <function-decl
> name='__wait_until_impl&lt;std::chrono::duration&lt;long, std::ratio&lt;1,
> 1000000000&gt; &gt; &gt;'
> mangled-name='_ZNSt18condition_variable17__wait_until_implINSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEEEESt9cv_statusRSt11unique_lockISt5mutexERKNS1_10time_pointINS1_3_V212system_clockET_EE'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/condition_variable'
> line='153' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-208'/>
> -            <parameter type-id='type-id-254'/>
> -            <return type-id='type-id-165'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
> +            <parameter type-id='type-id-61'/>
> +            <return type-id='type-id-147'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='wait_until&lt;std::chrono::duration&lt;long, std::ratio&lt;1,
> 1000000000&gt; &gt; &gt;'
> mangled-name='_ZNSt18condition_variable10wait_untilINSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEEEESt9cv_statusRSt11unique_lockISt5mutexERKNS1_10time_pointINS1_3_V212system_clockET_EE'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/condition_variable'
> line='103' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-208'/>
> -            <parameter type-id='type-id-254'/>
> -            <return type-id='type-id-165'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
> +            <parameter type-id='type-id-61'/>
> +            <return type-id='type-id-147'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__31' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='unique_lock'
> mangled-name='_ZNSt11unique_lockISt5mutexEC2ERS0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex'
> line='412' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-266'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-223'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~unique_lock'
> mangled-name='_ZNSt11unique_lockISt5mutexED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex'
> line='447' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5031,8 +4989,8 @@
>        <class-decl name='__anonymous_struct__32' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_M_head'
> mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo7BSONObjENS0_6Date_tEEE7_M_headERS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='142' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-208'/>
> -            <return type-id='type-id-116'/>
> +            <parameter type-id='type-id-53'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -5047,8 +5005,8 @@
>        <class-decl name='__anonymous_struct__37' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Head_base&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; &gt;'
> mangled-name='_ZNSt10_Head_baseILm0ESt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EELb0EEC2IS9_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5056,8 +5014,8 @@
>        <class-decl name='__anonymous_struct__38' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Tuple_impl&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; &gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEEEC2IS9_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='361' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5065,8 +5023,8 @@
>        <class-decl name='__anonymous_struct__39' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='tuple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; , void&gt;'
> mangled-name='_ZNSt5tupleIJSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEEEC2IJS9_EvEEDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='479' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5074,51 +5032,51 @@
>        <class-decl name='__anonymous_struct__40' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='protected' static='yes'>
>            <function-decl
> name='__shared_ptr&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;'
> mangled-name='_ZNSt12__shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEELN9__gnu_cxx12_Lock_policyE2EEC2ISaISF_EJSE_EEESt19_Sp_make_shared_tagRKT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='1094' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-252'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__41' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='__allocator_type' type-id='type-id-283'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='514' column='1' id='type-id-282'/>
> +          <typedef-decl name='__allocator_type' type-id='type-id-240'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='514' column='1' id='type-id-239'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Sp_counted_ptr_inplace&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;'
> mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EEC2IJSE_EEESG_DpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='517' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='_M_ptr'
> mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE6_M_ptrEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='555' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-233'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' vtable-offset='4'>
>            <function-decl name='_M_get_deleter'
> mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='545' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-257'/>
> -            <return type-id='type-id-135'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-220'/>
> +            <return type-id='type-id-118'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__42' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='__type' type-id='type-id-277'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='65' column='1' id='type-id-284'/>
> +          <typedef-decl name='__type' type-id='type-id-234'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='65' column='1' id='type-id-241'/>
>          </member-type>
>        </class-decl>
> -      <typedef-decl
> name='__alloc_rebind&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;,
> std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;,
> std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-284'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='76' column='1' id='type-id-283'/>
> -      <class-decl name='type_info' visibility='default'
> is-declaration-only='yes' id='type-id-255'>
> +      <typedef-decl
> name='__alloc_rebind&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;,
> std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;,
> std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-241'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='76' column='1' id='type-id-240'/>
> +      <class-decl name='type_info' visibility='default'
> is-declaration-only='yes' id='type-id-218'>
>          <member-function access='public'>
>            <function-decl name='operator=='
> mangled-name='_ZNKSt9type_infoeqERKS_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/typeinfo'
> line='120' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-258' is-artificial='yes'/>
> -            <parameter type-id='type-id-257'/>
> +            <parameter type-id='type-id-221' is-artificial='yes'/>
> +            <parameter type-id='type-id-220'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
> @@ -5127,8 +5085,8 @@
>        <class-decl name='__anonymous_struct__44' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='__shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;,
> void&gt;'
> mangled-name='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EEC2INS0_5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPSB_EEvEEEEvEEOS_IT_LS3_2EE'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h'
> line='940' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5136,8 +5094,8 @@
>        <class-decl name='__anonymous_struct__45' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;,
> void&gt;'
> mangled-name='_ZNSt10shared_ptrINSt6thread10_Impl_baseEEC2INS0_5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS9_EEvEEEEvEEOS_IT_E'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h'
> line='238' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5145,16 +5103,16 @@
>        <class-decl name='__anonymous_struct__46' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;,
> std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;'
> mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEE9constructISF_JSE_EEEvRSG_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-233'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;'
> mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEE7destroyISF_EEvRSG_PT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='541' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-233'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5162,29 +5120,29 @@
>        <class-decl name='__anonymous_struct__47' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~__allocated_ptr'
> mangled-name='_ZNSt15__allocated_ptrISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEESaISG_ELN9__gnu_cxx12_Lock_policyE2EEEED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/allocated_ptr.h'
> line='69' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__48' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='_Class' type-id='type-id-285'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='554' column='1' id='type-id-267'/>
> +          <typedef-decl name='_Class' type-id='type-id-242'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='554' column='1' id='type-id-224'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator()&lt;, void&gt;'
> mangled-name='_ZNKSt12_Mem_fn_baseIMN5mongo14FTDCControllerEFvvELb1EEclIJEvEEvPS1_DpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='599' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <parameter type-id='type-id-268'/>
> -            <return type-id='type-id-275'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-225'/>
> +            <return type-id='type-id-232'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__49' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='__result_type' type-id='type-id-22'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='506' column='1' id='type-id-286'/>
> +          <typedef-decl name='__result_type' type-id='type-id-22'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='506' column='1' id='type-id-243'/>
>          </member-type>
>          <member-type access='public'>
> -          <typedef-decl name='__class_type' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='507' column='1' id='type-id-285'/>
> +          <typedef-decl name='__class_type' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional'
> line='507' column='1' id='type-id-242'/>
>          </member-type>
>        </class-decl>
>      </namespace-decl>
> @@ -5193,8 +5151,8 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl name='getGlobalDomain'
> mangled-name='_ZN5mongo6logger10LogManager15getGlobalDomainEv'
> filepath='src/mongo/logger/log_manager.h' line='55' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> -              <return type-id='type-id-260'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <return type-id='type-id-55'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -5202,42 +5160,42 @@
>          <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='stream'
> mangled-name='_ZN5mongo6logger16LogstreamBuilder6streamEv'
> filepath='src/mongo/logger/logstream_builder.h' line='117' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> -              <return type-id='type-id-273'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <return type-id='type-id-230'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEPKc'
> filepath='src/mongo/logger/logstream_builder.h' line='123' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> -              <parameter type-id='type-id-66'/>
> -              <return type-id='type-id-261'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-64'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE'
> filepath='src/mongo/logger/logstream_builder.h' line='127' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> -              <parameter type-id='type-id-191'/>
> -              <return type-id='type-id-261'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-170'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;mongo::Status&gt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsINS_6StatusEEERS1_RKT_'
> filepath='src/mongo/logger/logstream_builder.h' line='209' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo6logger16LogstreamBuilderlsINS_6StatusEEERS1_RKT_'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> -              <parameter type-id='type-id-188'/>
> -              <return type-id='type-id-261'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-61'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>          <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-type access='private'>
> -            <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-287'>
> +            <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-244'>
>                <underlying-type type-id='type-id-18'/>
>              </enum-decl>
>            </member-type>
>            <member-function access='public' static='yes'>
>              <function-decl name='LogComponent'
> mangled-name='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE'
> filepath='src/mongo/logger/log_component.h' line='69' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> -              <parameter type-id='type-id-287'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-244'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -5247,16 +5205,16 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl
> name='thread&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;, 0&gt;'
> mangled-name='_ZN5mongo4stdx6threadC2ISt5_BindIFSt7_Mem_fnIMNS_14FTDCControllerEFvvEEPS5_EEJELi0EEEOT_DpOT0_'
> filepath='src/mongo/stdx/thread.h' line='80' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-264' is-artificial='yes'/>
> -              <parameter type-id='type-id-207'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-54'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator='
> mangled-name='_ZN5mongo4stdx6threadaSEOS1_'
> filepath='src/mongo/stdx/thread.h' line='88' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-264' is-artificial='yes'/>
> -              <parameter type-id='type-id-263'/>
> -              <return type-id='type-id-262'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-54'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -5267,20 +5225,20 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='reason'
> mangled-name='_ZNK5mongo6Status6reasonB5cxx11Ev'
> filepath='src/mongo/base/status.h' line='123' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-191'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-170'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='code'
> mangled-name='_ZNK5mongo6Status4codeEv' filepath='src/mongo/base/status.h'
> line='115' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-288'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-245'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-288'>
> +          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-245'>
>              <underlying-type type-id='type-id-18'/>
>            </enum-decl>
>          </member-type>
> @@ -5295,114 +5253,114 @@
>        <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
> -      <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> naming-typedef-id='type-id-285' visibility='default'
> is-declaration-only='yes' id='type-id-24'>
> +      <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> naming-typedef-id='type-id-242' visibility='default'
> is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-289'>
> +          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-246'>
>              <underlying-type type-id='type-id-18'/>
>            </enum-decl>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='setEnabled'
> mangled-name='_ZN5mongo14FTDCController10setEnabledEb'
> filepath='src/mongo/db/ftdc/controller.h' line='70' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController10setEnabledEb'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-1'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='setPeriod'
> mangled-name='_ZN5mongo14FTDCController9setPeriodENS_8DurationISt5ratioILl1ELl1000EEEE'
> filepath='src/mongo/db/ftdc/controller.h' line='75' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController9setPeriodENS_8DurationISt5ratioILl1ELl1000EEEE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-290'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-247'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='setMaxDirectorySizeBytes'
> mangled-name='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm'
> filepath='src/mongo/db/ftdc/controller.h' line='80' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-219'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-194'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='setMaxFileSizeBytes'
> mangled-name='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm'
> filepath='src/mongo/db/ftdc/controller.h' line='85' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-219'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-194'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='setMaxSamplesPerArchiveMetricChunk'
> mangled-name='_ZN5mongo14FTDCController34setMaxSamplesPerArchiveMetricChunkEm'
> filepath='src/mongo/db/ftdc/controller.h' line='91' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController34setMaxSamplesPerArchiveMetricChunkEm'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='setMaxSamplesPerInterimMetricChunk'
> mangled-name='_ZN5mongo14FTDCController34setMaxSamplesPerInterimMetricChunkEm'
> filepath='src/mongo/db/ftdc/controller.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController34setMaxSamplesPerInterimMetricChunkEm'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='setDirectory'
> mangled-name='_ZN5mongo14FTDCController12setDirectoryERKN5boost10filesystem4pathE'
> filepath='src/mongo/db/ftdc/controller.h' line='106' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController12setDirectoryERKN5boost10filesystem4pathE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-248'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='addPeriodicCollector'
> mangled-name='_ZN5mongo14FTDCController20addPeriodicCollectorESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'
> filepath='src/mongo/db/ftdc/controller.h' line='111' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController20addPeriodicCollectorESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='addOnRotateCollector'
> mangled-name='_ZN5mongo14FTDCController20addOnRotateCollectorESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'
> filepath='src/mongo/db/ftdc/controller.h' line='118' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController20addOnRotateCollectorESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='getMostRecentPeriodicDocument'
> mangled-name='_ZN5mongo14FTDCController29getMostRecentPeriodicDocumentEv'
> filepath='src/mongo/db/ftdc/controller.h' line='142' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController29getMostRecentPeriodicDocumentEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='start'
> mangled-name='_ZN5mongo14FTDCController5startEv'
> filepath='src/mongo/db/ftdc/controller.h' line='125' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController5startEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='doLoop'
> mangled-name='_ZN5mongo14FTDCController6doLoopEv'
> filepath='src/mongo/db/ftdc/controller.h' line='148' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController6doLoopEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='stop'
> mangled-name='_ZN5mongo14FTDCController4stopEv'
> filepath='src/mongo/db/ftdc/controller.h' line='132' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCController4stopEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> naming-typedef-id='type-id-290' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> -      <typedef-decl name='Milliseconds' type-id='type-id-24'
> filepath='src/mongo/util/duration.h' line='52' column='1' id='type-id-290'/>
> +      <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> naming-typedef-id='type-id-247' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <typedef-decl name='Milliseconds' type-id='type-id-24'
> filepath='src/mongo/util/duration.h' line='52' column='1' id='type-id-247'/>
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__11' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='IdleThreadBlock'
> mangled-name='_ZN5mongo15IdleThreadBlockC2EPKc'
> filepath='src/mongo/util/concurrency/idle_thread_block.h' line='48'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~IdleThreadBlock'
> mangled-name='_ZN5mongo15IdleThreadBlockD2Ev'
> filepath='src/mongo/util/concurrency/idle_thread_block.h' line='51'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5417,16 +5375,16 @@
>        <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;,
> std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEEE9constructISG_JSF_EEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-233'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void
> (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;
> &gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEEE7destroyISG_EEvPT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='124' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-233'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5437,23 +5395,23 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [104]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA104_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-250'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-216'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [36]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA36_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-251'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-217'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl
> name='operator&lt;&lt;&lt;std::__cxx11::basic_string&lt;char&gt; &gt;'
> mangled-name='_ZN10mongoutils3str6streamlsINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-153'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-135'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -5461,15 +5419,15 @@
>      </namespace-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='src/mongo/db/ftdc/decompressor.cpp'
> comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb'
> language='LANG_C_plus_plus'>
> -    <pointer-type-def type-id='type-id-291' size-in-bits='64'
> id='type-id-292'/>
> -    <qualified-type-def type-id='type-id-120' const='yes'
> id='type-id-293'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-293'
> size-in-bits='64' id='type-id-294'/>
> -    <pointer-type-def type-id='type-id-20' size-in-bits='64'
> id='type-id-295'/>
> +    <pointer-type-def type-id='type-id-248' size-in-bits='64'
> id='type-id-249'/>
> +    <qualified-type-def type-id='type-id-103' const='yes'
> id='type-id-250'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-250'
> size-in-bits='64' id='type-id-251'/>
> +    <pointer-type-def type-id='type-id-20' size-in-bits='64'
> id='type-id-252'/>
>      <namespace-decl name='boost'>
>        <namespace-decl name='detail'>
>          <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-type access='public'>
> -            <typedef-decl name='type' type-id='type-id-24'
> filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp'
> line='80' column='1' id='type-id-296'/>
> +            <typedef-decl name='type' type-id='type-id-24'
> filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp'
> line='80' column='1' id='type-id-253'/>
>            </member-type>
>          </class-decl>
>        </namespace-decl>
> @@ -5483,18 +5441,18 @@
>          <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>          <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-type access='private'>
> -            <typedef-decl name='internal_type' type-id='type-id-296'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='205' column='1' id='type-id-291'/>
> +            <typedef-decl name='internal_type' type-id='type-id-253'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='205' column='1' id='type-id-248'/>
>            </member-type>
>            <member-function access='private' static='yes'>
>              <function-decl name='get_object'
> mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE10get_objectEv'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='726' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <return type-id='type-id-292'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <return type-id='type-id-249'/>
>              </function-decl>
>            </member-function>
>            <member-function access='protected' static='yes'>
>              <function-decl name='get_impl'
> mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE8get_implEv'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='711' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <return type-id='type-id-235'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <return type-id='type-id-205'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -5502,8 +5460,8 @@
>          <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl name='address'
> mangled-name='_ZN5boost15optional_detail15aligned_storageISt6vectorIN5mongo7BSONObjESaIS4_EEE7addressEv'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='139' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <return type-id='type-id-135'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <return type-id='type-id-118'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -5519,95 +5477,95 @@
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='vector'
> mangled-name='_ZNSt6vectorImSaImEEC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='253' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='emplace_back&lt;mongo::BSONObj&gt;'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE12emplace_backIJS1_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='936' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='vector'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEC2ERKS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='318' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-252'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='end'
> mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE3endEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='574' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> -            <return type-id='type-id-210'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-185'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='vector'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEC2EOS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='335' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='emplace_back&lt;mongo::BSONObj &amp;&gt;'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE12emplace_backIJRS1_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='936' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~vector'
> mangled-name='_ZNSt6vectorIhSaIhEED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='423' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='capacity'
> mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE8capacityEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='734' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-48'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl
> name='_M_allocate_and_copy&lt;std::move_iterator&lt;mongo::BSONObj *&gt;
> &gt;'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE20_M_allocate_and_copyISt13move_iteratorIPS1_EEES6_mT_S8_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1221' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-159'/>
> +            <return type-id='type-id-141'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='reserve'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE7reserveEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='764' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE7reserveEm'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl name='_M_emplace_back_aux&lt;mongo::BSONObj&gt;'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1417' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl name='_M_emplace_back_aux&lt;mongo::BSONObj
> &amp;&gt;'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE19_M_emplace_back_auxIJRS1_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1417' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE19_M_emplace_back_auxIJRS1_EEEvDpOT_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~vector'
> mangled-name='_ZNSt6vectorIcSaIcEED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='423' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='_ZNSt6vectorIcSaIcEED2Ev'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~vector'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='423' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EED2Ev'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5617,7 +5575,7 @@
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='_Vector_impl'
> mangled-name='_ZNSt12_Vector_baseImSaImEE12_Vector_implC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='86' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-233' is-artificial='yes'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -5625,61 +5583,61 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Vector_base'
> mangled-name='_ZNSt12_Vector_baseImSaImEEC2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='124' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='_M_create_storage'
> mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE17_M_create_storageEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='183' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Vector_base'
> mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EEC2EmRKS2_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='134' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
> -            <parameter type-id='type-id-294'/>
> +            <parameter type-id='type-id-251'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Vector_base'
> mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EEC2EOS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='142' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~_Vector_base'
> mangled-name='_ZNSt12_Vector_baseIhSaIhEED2Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='159' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__3' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='rebind_alloc&lt;mongo::BSONObj&gt;'
> type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-297'/>
> +          <typedef-decl name='rebind_alloc&lt;mongo::BSONObj&gt;'
> type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-254'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;mongo::BSONObj,
> mongo::BSONObj&gt;'
> mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE9constructIS1_JS1_EEEvRS2_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;mongo::BSONObj,
> mongo::BSONObj &amp;&gt;'
> mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE9constructIS1_JRS1_EEEvRS2_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> naming-typedef-id='type-id-297' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> naming-typedef-id='type-id-254' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__6' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <class-decl name='__anonymous_struct__7' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
> @@ -5692,24 +5650,24 @@
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='protected' static='yes'>
>            <function-decl
> name='_M_allocate_and_copy&lt;std::move_iterator&lt;unsigned long *&gt;
> &gt;'
> mangled-name='_ZNSt6vectorImSaImEE20_M_allocate_and_copyISt13move_iteratorIPmEEES4_mT_S6_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1221' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-159'/>
> +            <return type-id='type-id-141'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='vector'
> mangled-name='_ZNSt6vectorImSaImEEC2EmRKS0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='277' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
> -            <parameter type-id='type-id-294'/>
> +            <parameter type-id='type-id-251'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl name='_M_default_initialize'
> mangled-name='_ZNSt6vectorImSaImEE21_M_default_initializeEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1308' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -5721,24 +5679,24 @@
>            <function-decl
> name='__uninit_copy&lt;__gnu_cxx::__normal_iterator&lt;const mongo::BSONObj
> *, std::vector&lt;mongo::BSONObj, std::allocator&lt;mongo::BSONObj&gt; &gt;
> &gt;, mongo::BSONObj *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN5mongo7BSONObjESt6vectorIS5_SaIS5_EEEEPS5_EET0_T_SE_SD_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='68' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-113'/>
> -            <return type-id='type-id-113'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='__uninit_copy&lt;std::move_iterator&lt;mongo::BSONObj *&gt;,
> mongo::BSONObj *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5mongo7BSONObjEES5_EET0_T_S8_S7_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='68' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-113'/>
> -            <return type-id='type-id-113'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__13' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__destroy&lt;mongo::BSONObj *&gt;'
> mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo7BSONObjEEEvT_S5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h'
> line='100' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5748,47 +5706,47 @@
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public'>
>            <function-decl
> name='readAndAdvance&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;'
> mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_12LittleEndianIjEEEENS_6StatusEPT_'
> filepath='src/mongo/base/data_range_cursor.h' line='74' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl
> name='readAndAdvance&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;'
> mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_12LittleEndianIjEEEENS_10StatusWithIT_EEv'
> filepath='src/mongo/base/data_range_cursor.h' line='88' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='ConstDataRangeCursor'
> mangled-name='_ZN5mongo20ConstDataRangeCursorC2ENS_14ConstDataRangeE'
> filepath='src/mongo/base/data_range_cursor.h' line='46' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='readAndAdvance&lt;mongo::FTDCVarInt&gt;'
> mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_10FTDCVarIntEEENS_10StatusWithIT_EEv'
> filepath='src/mongo/base/data_range_cursor.h' line='88' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='readAndAdvance&lt;mongo::FTDCVarInt&gt;'
> mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_10FTDCVarIntEEENS_6StatusEPT_'
> filepath='src/mongo/base/data_range_cursor.h' line='74' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl
> name='readAndAdvance&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;'
> mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_9ValidatedINS_7BSONObjEEEEENS_6StatusEPT_'
> filepath='src/mongo/base/data_range_cursor.h' line='74' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl
> name='readAndAdvance&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;'
> mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_9ValidatedINS_7BSONObjEEEEENS_10StatusWithIT_EEv'
> filepath='src/mongo/base/data_range_cursor.h' line='88' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_9ValidatedINS_7BSONObjEEEEENS_10StatusWithIT_EEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
> @@ -5798,19 +5756,19 @@
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='load'
> mangled-name='_ZN5mongo8DataType7HandlerIjvE4loadEPjPKcmPml'
> filepath='src/mongo/base/data_type.h' line='76' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-295'/>
> -                <parameter type-id='type-id-66'/>
> +                <parameter type-id='type-id-252'/>
> +                <parameter type-id='type-id-64'/>
>                  <parameter type-id='type-id-26'/>
> -                <parameter type-id='type-id-204'/>
> -                <parameter type-id='type-id-157'/>
> +                <parameter type-id='type-id-183'/>
> +                <parameter type-id='type-id-139'/>
>                  <return type-id='type-id-24'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeLoad'
> mangled-name='_ZN5mongo8DataType7HandlerIjvE10unsafeLoadEPjPKcPm'
> filepath='src/mongo/base/data_type.h' line='59' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-295'/>
> -                <parameter type-id='type-id-66'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-252'/>
> +                <parameter type-id='type-id-64'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -5820,11 +5778,11 @@
>            <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='load'
> mangled-name='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE4loadEPS2_PKcmPml'
> filepath='src/mongo/base/data_type_endian.h' line='96' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo8DataType7HandlerINS_9ValidatedINS_7BSONObjEEEvE4loadEPS4_PKcmPml'>
> -                <parameter type-id='type-id-113'/>
> -                <parameter type-id='type-id-66'/>
> +                <parameter type-id='type-id-55'/>
> +                <parameter type-id='type-id-64'/>
>                  <parameter type-id='type-id-26'/>
> -                <parameter type-id='type-id-204'/>
> -                <parameter type-id='type-id-157'/>
> +                <parameter type-id='type-id-183'/>
> +                <parameter type-id='type-id-139'/>
>                  <return type-id='type-id-24'/>
>                </function-decl>
>              </member-function>
> @@ -5850,31 +5808,31 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='load&lt;unsigned int&gt;'
> mangled-name='_ZN5mongo8DataType4loadIjEENS_6StatusEPT_PKcmPml'
> filepath='src/mongo/base/data_type.h' line='138' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-295'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-252'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-204'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-183'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='load&lt;mongo::LittleEndian&lt;unsigned
> int&gt; &gt;'
> mangled-name='_ZN5mongo8DataType4loadINS_12LittleEndianIjEEEENS_6StatusEPT_PKcmPml'
> filepath='src/mongo/base/data_type.h' line='138' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-204'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-183'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='load&lt;mongo::FTDCVarInt&gt;'
> mangled-name='_ZN5mongo8DataType4loadINS_10FTDCVarIntEEENS_6StatusEPT_PKcmPml'
> filepath='src/mongo/base/data_type.h' line='138' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-204'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-183'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
> @@ -5890,21 +5848,21 @@
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='load&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;'
> mangled-name='_ZN5mongo8DataType4loadINS_9ValidatedINS_7BSONObjEEEEENS_6StatusEPT_PKcmPml'
> filepath='src/mongo/base/data_type.h' line='138' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-204'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-183'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='load&lt;mongo::BSONObj&gt;'
> mangled-name='_ZN5mongo8DataType4loadINS_7BSONObjEEENS_6StatusEPT_PKcmPml'
> filepath='src/mongo/base/data_type.h' line='138' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-26'/>
> -            <parameter type-id='type-id-204'/>
> -            <parameter type-id='type-id-157'/>
> +            <parameter type-id='type-id-183'/>
> +            <parameter type-id='type-id-139'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
> @@ -5919,16 +5877,16 @@
>        <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public'>
>            <function-decl name='StatusWith'
> mangled-name='_ZN5mongo10StatusWithIbEC2ENS_10ErrorCodes5ErrorEPKc'
> filepath='src/mongo/base/status_with.h' line='76' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-230'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-202'/>
> +            <parameter type-id='type-id-64'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> naming-typedef-id='type-id-296' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> naming-typedef-id='type-id-253' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
> @@ -5936,7 +5894,7 @@
>        <class-decl name='__anonymous_struct__12' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='Validated'
> mangled-name='_ZN5mongo9ValidatedINS_7BSONObjEEC2Ev'
> filepath='src/mongo/base/data_type_validated.h' line='81' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -5954,7 +5912,7 @@
>        <class-decl name='__anonymous_struct__19' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='uncompress'
> mangled-name='_ZN5mongo16FTDCDecompressor10uncompressENS_14ConstDataRangeE'
> filepath='src/mongo/db/ftdc/decompressor.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo16FTDCDecompressor10uncompressENS_14ConstDataRangeE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
> @@ -5963,7 +5921,7 @@
>        <class-decl name='__anonymous_struct__20' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='validateLoad'
> mangled-name='_ZN5mongo9ValidatorINS_7BSONObjEE12validateLoadEPKcm'
> filepath='src/mongo/rpc/object_check.h' line='54' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
> @@ -5987,17 +5945,17 @@
>        <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;mongo::BSONObj,
> mongo::BSONObj&gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE9constructIS2_JS2_EEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-114'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;mongo::BSONObj,
> mongo::BSONObj &amp;&gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE9constructIS2_JRS2_EEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6006,60 +5964,43 @@
>      </namespace-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='src/mongo/db/ftdc/file_manager.cpp'
> comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb'
> language='LANG_C_plus_plus'>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='16'
> id='type-id-298'>
> -      <subrange length='2' type-id='type-id-5' id='type-id-299'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='16'
> id='type-id-255'>
> +      <subrange length='2' type-id='type-id-5' id='type-id-256'/>
>      </array-type-def>
> -    <reference-type-def kind='rvalue' type-id='type-id-1'
> size-in-bits='64' id='type-id-300'/>
> -    <pointer-type-def type-id='type-id-301' size-in-bits='64'
> id='type-id-302'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-303'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-304'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-24'
> size-in-bits='64' id='type-id-305'/>
> -    <qualified-type-def type-id='type-id-246' const='yes'
> id='type-id-306'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-306'
> size-in-bits='64' id='type-id-307'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-308'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-309'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-310'/>
> -    <qualified-type-def type-id='type-id-24' const='yes'
> id='type-id-311'/>
> -    <pointer-type-def type-id='type-id-311' size-in-bits='64'
> id='type-id-312'/>
> -    <qualified-type-def type-id='type-id-24' const='yes'
> id='type-id-313'/>
> -    <pointer-type-def type-id='type-id-313' size-in-bits='64'
> id='type-id-314'/>
> -    <qualified-type-def type-id='type-id-315' const='yes'
> id='type-id-316'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-316'
> size-in-bits='64' id='type-id-317'/>
> -    <qualified-type-def type-id='type-id-318' const='yes'
> id='type-id-319'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-319'
> size-in-bits='64' id='type-id-320'/>
> -    <qualified-type-def type-id='type-id-24' const='yes'
> id='type-id-321'/>
> -    <pointer-type-def type-id='type-id-321' size-in-bits='64'
> id='type-id-322'/>
> -    <qualified-type-def type-id='type-id-24' const='yes'
> id='type-id-323'/>
> -    <pointer-type-def type-id='type-id-323' size-in-bits='64'
> id='type-id-324'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-298'
> size-in-bits='64' id='type-id-325'/>
> -    <qualified-type-def type-id='type-id-326' const='yes'
> id='type-id-327'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-327'
> size-in-bits='64' id='type-id-328'/>
> -    <pointer-type-def type-id='type-id-327' size-in-bits='64'
> id='type-id-329'/>
> -    <qualified-type-def type-id='type-id-168' const='yes'
> id='type-id-330'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-330'
> size-in-bits='64' id='type-id-152'/>
> -    <pointer-type-def type-id='type-id-331' size-in-bits='64'
> id='type-id-332'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-333'
> size-in-bits='64' id='type-id-334'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-333'
> size-in-bits='64' id='type-id-335'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-326'
> size-in-bits='64' id='type-id-336'/>
> -    <pointer-type-def type-id='type-id-326' size-in-bits='64'
> id='type-id-337'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-87'
> size-in-bits='64' id='type-id-155'/>
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-151'/>
> -    <pointer-type-def type-id='type-id-338' size-in-bits='64'
> id='type-id-339'/>
> -    <pointer-type-def type-id='type-id-278' size-in-bits='64'
> id='type-id-280'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-279'
> size-in-bits='64' id='type-id-281'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-1'
> size-in-bits='64' id='type-id-257'/>
> +    <pointer-type-def type-id='type-id-258' size-in-bits='64'
> id='type-id-259'/>
> +    <qualified-type-def type-id='type-id-260' const='yes'
> id='type-id-261'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-261'
> size-in-bits='64' id='type-id-262'/>
> +    <qualified-type-def type-id='type-id-263' const='yes'
> id='type-id-264'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-264'
> size-in-bits='64' id='type-id-265'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-255'
> size-in-bits='64' id='type-id-266'/>
> +    <qualified-type-def type-id='type-id-267' const='yes'
> id='type-id-268'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-268'
> size-in-bits='64' id='type-id-269'/>
> +    <pointer-type-def type-id='type-id-268' size-in-bits='64'
> id='type-id-270'/>
> +    <qualified-type-def type-id='type-id-150' const='yes'
> id='type-id-271'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-271'
> size-in-bits='64' id='type-id-134'/>
> +    <pointer-type-def type-id='type-id-272' size-in-bits='64'
> id='type-id-273'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-274'
> size-in-bits='64' id='type-id-275'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-274'
> size-in-bits='64' id='type-id-276'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-267'
> size-in-bits='64' id='type-id-277'/>
> +    <pointer-type-def type-id='type-id-267' size-in-bits='64'
> id='type-id-278'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-77'
> size-in-bits='64' id='type-id-137'/>
> +    <pointer-type-def type-id='type-id-279' size-in-bits='64'
> id='type-id-280'/>
> +    <pointer-type-def type-id='type-id-235' size-in-bits='64'
> id='type-id-237'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-236'
> size-in-bits='64' id='type-id-238'/>
>      <namespace-decl name='boost'>
>        <namespace-decl name='filesystem'>
>          <namespace-decl name='detail'>
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public'>
>                <function-decl name='dir_itr_imp'
> mangled-name='_ZN5boost10filesystem6detail11dir_itr_impC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='860' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-308' is-artificial='yes'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' destructor='yes'>
>                <function-decl name='~dir_itr_imp'
> mangled-name='_ZN5boost10filesystem6detail11dir_itr_impD2Ev'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='866' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-308' is-artificial='yes'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -6067,99 +6008,99 @@
>          </namespace-decl>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-type access='private'>
> -            <typedef-decl name='string_type' type-id='type-id-87'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='70'
> column='1' id='type-id-318'/>
> +            <typedef-decl name='string_type' type-id='type-id-77'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='70'
> column='1' id='type-id-263'/>
>            </member-type>
>            <member-function access='public'>
>              <function-decl name='path'
> mangled-name='_ZN5boost10filesystem4pathC2ERKS1_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='133' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-248'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-61'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='path'
> mangled-name='_ZN5boost10filesystem4pathC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='132' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='path'
> mangled-name='_ZN5boost10filesystem4pathC2EOS1_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='153' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-305'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-54'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='path'
> mangled-name='_ZN5boost10filesystem4pathC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='145' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-320'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-265'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator/='
> mangled-name='_ZN5boost10filesystem4pathdVERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='335' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-320'/>
> -              <return type-id='type-id-245'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-265'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator+='
> mangled-name='_ZN5boost10filesystem4pathpLERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='265' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-320'/>
> -              <return type-id='type-id-245'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-265'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='swap'
> mangled-name='_ZN5boost10filesystem4path4swapERS1_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='374' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-245'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-53'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator='
> mangled-name='_ZN5boost10filesystem4pathaSEOS1_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='154' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-305'/>
> -              <return type-id='type-id-245'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-54'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>          <function-decl name='operator/'
> mangled-name='_ZN5boost10filesystemdvERKNS0_4pathES3_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='789' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='_ZN5boost10filesystemdvERKNS0_4pathES3_'>
> -          <parameter type-id='type-id-248' name='lhs'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='789' column='1'/>
> -          <parameter type-id='type-id-248' name='rhs'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='789' column='1'/>
> +          <parameter type-id='type-id-61' name='lhs'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='789' column='1'/>
> +          <parameter type-id='type-id-61' name='rhs'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='789' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='private' static='yes'>
>              <function-decl name='equal'
> mangled-name='_ZNK5boost10filesystem18directory_iterator5equalERKS1_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='941' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-249' is-artificial='yes'/>
> -              <parameter type-id='type-id-248'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
> +              <parameter type-id='type-id-61'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private' static='yes'>
>              <function-decl name='dereference'
> mangled-name='_ZNK5boost10filesystem18directory_iterator11dereferenceEv'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='933' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-249' is-artificial='yes'/>
> -              <return type-id='type-id-340'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
> +              <return type-id='type-id-281'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private' static='yes'>
>              <function-decl name='increment'
> mangled-name='_ZN5boost10filesystem18directory_iterator9incrementEv'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='939' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes' destructor='yes'>
>              <function-decl name='~directory_iterator'
> mangled-name='_ZN5boost10filesystem18directory_iteratorD2Ev'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='909' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes'>
>              <function-decl name='directory_iterator'
> mangled-name='_ZN5boost10filesystem18directory_iteratorC2ERKNS0_4pathE'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='901' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZN5boost10filesystem18directory_iteratorC2ERKNS0_4pathE'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-248'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-61'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -6167,14 +6108,14 @@
>          <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl name='directory_entry'
> mangled-name='_ZN5boost10filesystem15directory_entryC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='749' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes'>
>              <function-decl name='directory_entry'
> mangled-name='_ZN5boost10filesystem15directory_entryC2ERKS1_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='757' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZN5boost10filesystem15directory_entryC2ERKS1_'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-248'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-61'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -6182,14 +6123,14 @@
>          <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl name='file_status'
> mangled-name='_ZN5boost10filesystem11file_statusC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='258' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes'>
>              <function-decl name='file_status'
> mangled-name='_ZN5boost10filesystem11file_statusC2ERKS1_'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp'
> line='269' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-248'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-61'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -6199,26 +6140,26 @@
>          <namespace-decl name='detail'>
>            <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>              <member-type access='private'>
> -              <typedef-decl name='reference' type-id='type-id-245'
> filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp'
> line='645' column='1' id='type-id-340'/>
> +              <typedef-decl name='reference' type-id='type-id-53'
> filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp'
> line='645' column='1' id='type-id-281'/>
>              </member-type>
>              <member-function access='public'>
>                <function-decl name='operator*'
> mangled-name='_ZNK5boost9iterators6detail20iterator_facade_baseINS_10filesystem18directory_iteratorENS3_15directory_entryENS0_25single_pass_traversal_tagERS5_lLb0ELb0EEdeEv'
> filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp'
> line='653' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-322' is-artificial='yes'/>
> -                <return type-id='type-id-340'/>
> +                <parameter type-id='type-id-62' is-artificial='yes'/>
> +                <return type-id='type-id-281'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public'>
>                <function-decl name='operator++'
> mangled-name='_ZN5boost9iterators6detail20iterator_facade_baseINS_10filesystem18directory_iteratorENS3_15directory_entryENS0_25single_pass_traversal_tagERS5_lLb0ELb0EEppEv'
> filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp'
> line='663' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-309' is-artificial='yes'/>
> -                <return type-id='type-id-245'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
> +                <return type-id='type-id-53'/>
>                </function-decl>
>              </member-function>
>            </class-decl>
>            <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='postfix_increment_proxy'
> mangled-name='_ZN5boost9iterators6detail23postfix_increment_proxyINS_10filesystem18directory_iteratorEEC2ERKS4_'
> filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp'
> line='157' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -                <parameter type-id='type-id-309' is-artificial='yes'/>
> -                <parameter type-id='type-id-248'/>
> +                <parameter type-id='type-id-55' is-artificial='yes'/>
> +                <parameter type-id='type-id-61'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -6227,21 +6168,21 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='private' static='yes'>
>              <function-decl
> name='equal&lt;boost::filesystem::directory_iterator,
> boost::filesystem::directory_iterator&gt;'
> mangled-name='_ZN5boost9iterators20iterator_core_access5equalINS_10filesystem18directory_iteratorES4_EEbRKT_RKT0_N4mpl_5bool_ILb1EEE'
> filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp'
> line='565' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-248'/>
> -              <parameter type-id='type-id-248'/>
> -              <parameter type-id='type-id-341'/>
> +              <parameter type-id='type-id-61'/>
> +              <parameter type-id='type-id-61'/>
> +              <parameter type-id='type-id-282'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private' static='yes'>
>              <function-decl
> name='dereference&lt;boost::filesystem::directory_iterator&gt;'
> mangled-name='_ZN5boost9iterators20iterator_core_access11dereferenceINS_10filesystem18directory_iteratorEEENT_9referenceERKS5_'
> filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp'
> line='547' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-248'/>
> -              <return type-id='type-id-340'/>
> +              <parameter type-id='type-id-61'/>
> +              <return type-id='type-id-281'/>
>              </function-decl>
>            </member-function>
>            <member-function access='private' static='yes'>
>              <function-decl
> name='increment&lt;boost::filesystem::directory_iterator&gt;'
> mangled-name='_ZN5boost9iterators20iterator_core_access9incrementINS_10filesystem18directory_iteratorEEEvRT_'
> filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp'
> line='553' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-245'/>
> +              <parameter type-id='type-id-53'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -6257,45 +6198,45 @@
>          <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public' destructor='yes'>
>              <function-decl name='~shared_count'
> mangled-name='_ZN5boost6detail12shared_countD2Ev'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp'
> line='471' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='shared_count'
> mangled-name='_ZN5boost6detail12shared_countC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp'
> line='121' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='swap'
> mangled-name='_ZN5boost6detail12shared_count4swapERS1_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp'
> line='516' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> -              <parameter type-id='type-id-303'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-53'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl
> name='shared_count&lt;boost::filesystem::detail::dir_itr_imp&gt;'
> mangled-name='_ZN5boost6detail12shared_countC2INS_10filesystem6detail11dir_itr_impEEEPT_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp'
> line='128' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZN5boost6detail12shared_countC2INS_10filesystem6detail11dir_itr_impEEEPT_'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> -              <parameter type-id='type-id-308'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-55'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes' destructor='yes'
> vtable-offset='0'>
>              <function-decl name='~sp_counted_base'
> mangled-name='_ZN5boost6detail15sp_counted_baseD2Ev'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp'
> line='79' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='_ZN5boost6detail15sp_counted_baseD2Ev'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes' vtable-offset='3'>
>              <function-decl name='destroy'
> mangled-name='_ZN5boost6detail15sp_counted_base7destroyEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp'
> line='90' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZN5boost6detail15sp_counted_base7destroyEv'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes' vtable-offset='2'>
>              <function-decl name='dispose'
> mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE7disposeEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp'
> line='73' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE7disposeEv'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -6303,19 +6244,19 @@
>          <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl name='release'
> mangled-name='_ZN5boost6detail15sp_counted_base7releaseEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp'
> line='108' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes'>
>              <function-decl name='weak_release'
> mangled-name='_ZN5boost6detail15sp_counted_base12weak_releaseEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp'
> line='122' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes'>
>              <function-decl name='sp_counted_base'
> mangled-name='_ZN5boost6detail15sp_counted_baseC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp'
> line='73' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -6323,53 +6264,53 @@
>          <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl name='sp_counted_impl_p'
> mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEEC2EPS4_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp'
> line='66' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> -              <parameter type-id='type-id-308'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-55'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes' vtable-offset='4'>
>              <function-decl name='get_deleter'
> mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE11get_deleterERKSt9type_info'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp'
> line='81' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE11get_deleterERKSt9type_info'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> -              <parameter type-id='type-id-317'/>
> -              <return type-id='type-id-135'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-262'/>
> +              <return type-id='type-id-118'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public' static='yes' vtable-offset='5'>
>              <function-decl name='get_untyped_deleter'
> mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE19get_untyped_deleterEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp'
> line='86' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE19get_untyped_deleterEv'>
> -              <parameter type-id='type-id-304' is-artificial='yes'/>
> -              <return type-id='type-id-135'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <return type-id='type-id-118'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> -        <typedef-decl name='sp_typeinfo' type-id='type-id-342'
> filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp'
> line='28' column='1' id='type-id-315'/>
> +        <typedef-decl name='sp_typeinfo' type-id='type-id-283'
> filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp'
> line='28' column='1' id='type-id-260'/>
>        </namespace-decl>
>        <namespace-decl name='system'>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-type access='private'>
> -            <typedef-decl name='unspecified_bool_type'
> type-id='type-id-134'
> filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp'
> line='359' column='1' id='type-id-343'/>
> +            <typedef-decl name='unspecified_bool_type'
> type-id='type-id-117'
> filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp'
> line='359' column='1' id='type-id-284'/>
>            </member-type>
>            <member-function access='public'>
>              <function-decl name='error_code'
> mangled-name='_ZN5boost6system10error_codeC2Ev'
> filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp'
> line='322' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-310' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator void (*)()'
> mangled-name='_ZNK5boost6system10error_codecvPFvvEEv'
> filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp'
> line='362' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-324' is-artificial='yes'/>
> -              <return type-id='type-id-343'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
> +              <return type-id='type-id-284'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='message'
> mangled-name='_ZNK5boost6system10error_code7messageB5cxx11Ev'
> filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp'
> line='357' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-324' is-artificial='yes'/>
> -              <return type-id='type-id-189'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
> +              <return type-id='type-id-168'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='value'
> mangled-name='_ZNK5boost6system10error_code5valueEv'
> filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp'
> line='354' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-324' is-artificial='yes'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
>                <return type-id='type-id-13'/>
>              </function-decl>
>            </member-function>
> @@ -6384,16 +6325,16 @@
>          <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='protected' static='yes'>
>              <function-decl name='assign'
> mangled-name='_ZN5boost15optional_detail13optional_baseIbE6assignEOS2_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='347' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <parameter type-id='type-id-223'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-54'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='protected' static='yes'>
>              <function-decl name='assign_value'
> mangled-name='_ZN5boost15optional_detail13optional_baseIbE12assign_valueEObN4mpl_5bool_ILb0EEE'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='700' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <parameter type-id='type-id-141'/>
> -              <parameter type-id='type-id-217'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-124'/>
> +              <parameter type-id='type-id-192'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
> @@ -6401,25 +6342,25 @@
>          <class-decl name='__anonymous_struct__6' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        </namespace-decl>
>        <namespace-decl name='core'>
> -        <typedef-decl name='typeinfo' type-id='type-id-255'
> filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134'
> column='1' id='type-id-342'/>
> +        <typedef-decl name='typeinfo' type-id='type-id-218'
> filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134'
> column='1' id='type-id-283'/>
>        </namespace-decl>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='element_type' type-id='type-id-296'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp'
> line='345' column='1' id='type-id-301'/>
> +          <typedef-decl name='element_type' type-id='type-id-253'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp'
> line='345' column='1' id='type-id-258'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='get'
> mangled-name='_ZNK5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEE3getEv'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp'
> line='706' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-65' is-artificial='yes'/>
> -            <return type-id='type-id-302'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-259'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='shared_ptr&lt;boost::filesystem::detail::dir_itr_imp&gt;'
> mangled-name='_ZN5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEEC2IS3_EEPT_'
> filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp'
> line='360' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-308'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6429,7 +6370,7 @@
>      <namespace-decl name='std'>
>        <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='difference_type' type-id='type-id-157'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator_base_types.h'
> line='182' column='1' id='type-id-344'/>
> +          <typedef-decl name='difference_type' type-id='type-id-139'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator_base_types.h'
> line='182' column='1' id='type-id-285'/>
>          </member-type>
>        </class-decl>
>        <function-decl
> name='__introsort_loop&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path
> *, std::vector&lt;boost::filesystem::path,
> std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, long,
> __gnu_cxx::__ops::_Iter_less_iter&gt;'
> mangled-name='_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElNS0_5__ops15_Iter_less_iterEEvT_SC_T0_T1_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h'
> line='1935' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElNS0_5__ops15_Iter_less_iterEEvT_SC_T0_T1_'>
> @@ -6474,32 +6415,32 @@
>        </function-decl>
>        <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='rebind_alloc&lt;char&gt;'
> type-id='type-id-168'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-345'/>
> +          <typedef-decl name='rebind_alloc&lt;char&gt;'
> type-id='type-id-150'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-286'/>
>          </member-type>
>        </class-decl>
>        <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <class-decl name='__anonymous_struct__3' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='char_type' type-id='type-id-2'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h'
> line='235' column='1' id='type-id-326'/>
> +          <typedef-decl name='char_type' type-id='type-id-2'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h'
> line='235' column='1' id='type-id-267'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='assign'
> mangled-name='_ZNSt11char_traitsIcE6assignERcRKc'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h'
> line='242' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-336'/>
> -            <parameter type-id='type-id-328'/>
> +            <parameter type-id='type-id-277'/>
> +            <parameter type-id='type-id-269'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='copy'
> mangled-name='_ZNSt11char_traitsIcE4copyEPcPKcm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h'
> line='286' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-337'/>
> -            <parameter type-id='type-id-329'/>
> +            <parameter type-id='type-id-278'/>
> +            <parameter type-id='type-id-270'/>
>              <parameter type-id='type-id-47'/>
> -            <return type-id='type-id-337'/>
> +            <return type-id='type-id-278'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='length'
> mangled-name='_ZNSt11char_traitsIcE6lengthEPKc'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h'
> line='266' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-329'/>
> +            <parameter type-id='type-id-270'/>
>              <return type-id='type-id-47'/>
>            </function-decl>
>          </member-function>
> @@ -6507,15 +6448,15 @@
>        <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='emplace_back&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj, mongo::Date_t&gt; &gt;'
> mangled-name='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE12emplace_backIJS6_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='936' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl
> name='_M_emplace_back_aux&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj, mongo::Date_t&gt; &gt;'
> mangled-name='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE19_M_emplace_back_auxIJS6_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1417' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE19_M_emplace_back_auxIJS6_EEEvDpOT_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6527,55 +6468,55 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__6' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl
> name='rebind_alloc&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj, mongo::Date_t&gt; &gt;' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-346'/>
> +          <typedef-decl
> name='rebind_alloc&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj, mongo::Date_t&gt; &gt;' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-287'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='construct&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj, mongo::Date_t&gt;,
> std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj,
> mongo::Date_t&gt; &gt;'
> mangled-name='_ZNSt16allocator_traitsISaISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEEEE9constructIS6_JS6_EEEvRS7_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-119'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> naming-typedef-id='type-id-346' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> naming-typedef-id='type-id-287' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::FTDCBSONUtil::FTDCType
> &amp;, mongo::BSONObj, mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2IJRS2_S3_RS4_EvEEDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='479' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-334'/>
> -            <parameter type-id='type-id-114'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-275'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='reverse_iterator' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='235' column='1' id='type-id-347'/>
> +          <typedef-decl name='reverse_iterator' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='235' column='1' id='type-id-288'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='emplace_back&lt;boost::filesystem::path&gt;'
> mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE12emplace_backIJS2_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='936' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-305'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='rbegin'
> mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE6rbeginEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='583' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-347'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-288'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected' static='yes'>
>            <function-decl
> name='_M_emplace_back_aux&lt;boost::filesystem::path&gt;'
> mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1417' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-305'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> naming-typedef-id='type-id-347' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> naming-typedef-id='type-id-288' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__11' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
> @@ -6583,42 +6524,42 @@
>        </class-decl>
>        <class-decl name='__anonymous_struct__12' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl
> name='rebind_alloc&lt;boost::filesystem::path&gt;' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-348'/>
> +          <typedef-decl
> name='rebind_alloc&lt;boost::filesystem::path&gt;' type-id='type-id-24'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='477' column='1' id='type-id-289'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;boost::filesystem::path,
> boost::filesystem::path&gt;'
> mangled-name='_ZNSt16allocator_traitsISaIN5boost10filesystem4pathEEE9constructIS2_JS2_EEEvRS3_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-246'/>
> -            <parameter type-id='type-id-305'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='__anonymous_struct__13' is-anonymous='yes'
> naming-typedef-id='type-id-348' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> -      <class-decl name='basic_ofstream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='4096' visibility='default'
> is-declaration-only='yes' id='type-id-338'>
> +      <class-decl name='__anonymous_struct__13' is-anonymous='yes'
> naming-typedef-id='type-id-289' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <class-decl name='basic_ofstream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='4096' visibility='default'
> is-declaration-only='yes' id='type-id-279'>
>          <member-function access='public'>
>            <function-decl name='is_open'
> mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='778' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-339' is-artificial='yes'/>
> +            <parameter type-id='type-id-280' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='close'
> mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE5closeEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='839' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-339' is-artificial='yes'/>
> +            <parameter type-id='type-id-280' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='open'
> mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='799' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-339' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-349'/>
> +            <parameter type-id='type-id-280' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-290'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='0'>
>            <function-decl name='~basic_ofstream'
> mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED1Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='737' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-339' is-artificial='yes'/>
> +            <parameter type-id='type-id-280' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6629,15 +6570,15 @@
>        <class-decl name='__anonymous_struct__17' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='__destroy&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj, mongo::Date_t&gt; *&gt;'
> mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS3_7BSONObjENS3_6Date_tEEEEEvT_SA_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h'
> line='100' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119'/>
> -            <parameter type-id='type-id-119'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='__destroy&lt;boost::filesystem::path
> *&gt;'
> mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5boost10filesystem4pathEEEvT_S6_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h'
> line='100' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-246'/>
> -            <parameter type-id='type-id-246'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6648,8 +6589,8 @@
>        <class-decl name='__anonymous_struct__21' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Head_base&lt;mongo::FTDCFileManager
> *&gt;'
> mangled-name='_ZNSt10_Head_baseILm0EPN5mongo15FTDCFileManagerELb0EEC2IS2_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-259'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-215'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6657,9 +6598,9 @@
>        <class-decl name='__anonymous_struct__22' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::FTDCFileManager *,
> std::default_delete&lt;mongo::FTDCFileManager&gt; , void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo15FTDCFileManagerESt14default_deleteIS1_EEEC2IS2_JS4_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-259'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-215'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6667,9 +6608,9 @@
>        <class-decl name='__anonymous_struct__23' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::FTDCFileManager *,
> std::default_delete&lt;mongo::FTDCFileManager&gt;, void&gt;'
> mangled-name='_ZNSt5tupleIJPN5mongo15FTDCFileManagerESt14default_deleteIS1_EEEC2IS2_S4_vEEOT_OT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='612' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-259'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-215'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6682,10 +6623,10 @@
>        <class-decl name='__anonymous_struct__25' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Tuple_impl&lt;mongo::FTDCBSONUtil::FTDCType &amp;, mongo::BSONObj,
> mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2IRS2_JS3_RS4_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-334'/>
> -            <parameter type-id='type-id-114'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-275'/>
> +            <parameter type-id='type-id-54'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6693,8 +6634,8 @@
>        <class-decl name='__anonymous_struct__26' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_M_head'
> mangled-name='_ZNSt11_Tuple_implILm1EJRKN5mongo7BSONObjENS0_6Date_tEEE7_M_headERS5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='142' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-208'/>
> -            <return type-id='type-id-188'/>
> +            <parameter type-id='type-id-53'/>
> +            <return type-id='type-id-61'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -6704,15 +6645,15 @@
>        <class-decl name='__anonymous_struct__30' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Head_base&lt;mongo::FTDCBSONUtil::FTDCType &amp;&gt;'
> mangled-name='_ZNSt10_Head_baseILm0EN5mongo12FTDCBSONUtil8FTDCTypeELb0EEC2IRS2_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-334'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-275'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Head_base&lt;mongo::FTDCBSONUtil::FTDCType&gt;'
> mangled-name='_ZNSt10_Head_baseILm0EN5mongo12FTDCBSONUtil8FTDCTypeELb0EEC2IS2_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-335'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-276'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6750,16 +6691,16 @@
>            <function-decl
> name='__uninit_copy&lt;std::move_iterator&lt;boost::filesystem::path *&gt;,
> boost::filesystem::path *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5boost10filesystem4pathEES6_EET0_T_S9_S8_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='68' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-246'/>
> -            <return type-id='type-id-246'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='__uninit_copy&lt;std::move_iterator&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj, mongo::Date_t&gt; *&gt;,
> std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj,
> mongo::Date_t&gt; *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS4_7BSONObjENS4_6Date_tEEEESA_EET0_T_SD_SC_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='68' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-119'/>
> -            <return type-id='type-id-119'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -6767,10 +6708,10 @@
>        <class-decl name='__anonymous_struct__49' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__copy_move_b&lt;boost::filesystem::path
> *, boost::filesystem::path *&gt;'
> mangled-name='_ZNSt20__copy_move_backwardILb1ELb0ESt26random_access_iterator_tagE13__copy_move_bIPN5boost10filesystem4pathES6_EET0_T_S8_S7_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h'
> line='560' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-246'/>
> -            <parameter type-id='type-id-246'/>
> -            <parameter type-id='type-id-246'/>
> -            <return type-id='type-id-246'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -6781,7 +6722,7 @@
>          <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-function access='public'>
>              <function-decl
> name='operator()&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path
> *, std::vector&lt;boost::filesystem::path,
> std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;,
> __gnu_cxx::__normal_iterator&lt;boost::filesystem::path *,
> std::vector&lt;boost::filesystem::path,
> std::allocator&lt;boost::filesystem::path&gt; &gt; &gt; &gt;'
> mangled-name='_ZNK9__gnu_cxx5__ops15_Iter_less_iterclINS_17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS6_SaIS6_EEEESB_EEbT_T0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h'
> line='42' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-314' is-artificial='yes'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
>                <parameter type-id='type-id-24'/>
>                <parameter type-id='type-id-24'/>
>                <return type-id='type-id-1'/>
> @@ -6791,8 +6732,8 @@
>          <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl name='operator()&lt;boost::filesystem::path,
> __gnu_cxx::__normal_iterator&lt;boost::filesystem::path *,
> std::vector&lt;boost::filesystem::path,
> std::allocator&lt;boost::filesystem::path&gt; &gt; &gt; &gt;'
> mangled-name='_ZNK9__gnu_cxx5__ops14_Val_less_iterclIN5boost10filesystem4pathENS_17__normal_iteratorIPS5_St6vectorIS5_SaIS5_EEEEEEbRT_T0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h'
> line='70' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-314' is-artificial='yes'/>
> -              <parameter type-id='type-id-245'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
> +              <parameter type-id='type-id-53'/>
>                <parameter type-id='type-id-24'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
> @@ -6801,9 +6742,9 @@
>          <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-function access='public' static='yes'>
>              <function-decl
> name='operator()&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path
> *, std::vector&lt;boost::filesystem::path,
> std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;,
> boost::filesystem::path&gt;'
> mangled-name='_ZNK9__gnu_cxx5__ops14_Iter_less_valclINS_17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS6_SaIS6_EEEES6_EEbT_RT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h'
> line='54' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-314' is-artificial='yes'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
>                <parameter type-id='type-id-24'/>
> -              <parameter type-id='type-id-245'/>
> +              <parameter type-id='type-id-53'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
>            </member-function>
> @@ -6811,33 +6752,33 @@
>        </namespace-decl>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='difference_type' type-id='type-id-344'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='732' column='1' id='type-id-350'/>
> +          <typedef-decl name='difference_type' type-id='type-id-285'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='732' column='1' id='type-id-291'/>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='__normal_iterator'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEC2ERKS4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='740' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-307'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-162'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator+'
> mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEplEl'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='793' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-312' is-artificial='yes'/>
> -            <parameter type-id='type-id-350'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-291'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator-'
> mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEmiEl'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='801' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-312' is-artificial='yes'/>
> -            <parameter type-id='type-id-350'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-291'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator--'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEmmEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='773' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <return type-id='type-id-179'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -6861,9 +6802,9 @@
>        <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='construct&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj, mongo::Date_t&gt;,
> std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj,
> mongo::Date_t&gt; &gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS2_7BSONObjENS2_6Date_tEEEE9constructIS7_JS7_EEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-119'/>
> -            <parameter type-id='type-id-207'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6871,9 +6812,9 @@
>        <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;boost::filesystem::path,
> boost::filesystem::path&gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorIN5boost10filesystem4pathEE9constructIS3_JS3_EEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-246'/>
> -            <parameter type-id='type-id-305'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-54'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -6903,104 +6844,104 @@
>          <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEm'
> filepath='src/mongo/logger/logstream_builder.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <parameter type-id='type-id-21'/>
> -              <return type-id='type-id-261'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>          <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-type access='private'>
> -            <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-351'>
> +            <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-292'>
>                <underlying-type type-id='type-id-18'/>
>              </enum-decl>
>            </member-type>
>          </class-decl>
>        </namespace-decl>
>        <namespace-decl name='FTDCBSONUtil'>
> -        <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-333'>
> +        <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-274'>
>            <underlying-type type-id='type-id-18'/>
>          </enum-decl>
>        </namespace-decl>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='private'>
>            <function-decl name='FTDCFileManager'
> mangled-name='_ZN5mongo15FTDCFileManagerC2EPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionE'
> filepath='src/mongo/db/ftdc/file_manager.h' line='101' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManagerC2EPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-80'/>
> -            <parameter type-id='type-id-248'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-62'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-55'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='close'
> mangled-name='_ZN5mongo14FTDCFileWriter5closeEv'
> filepath='src/mongo/db/ftdc/file_manager.h' line='90' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager5closeEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'>
>            <function-decl name='~FTDCFileManager'
> mangled-name='_ZN5mongo15FTDCFileManagerD2Ev'
> filepath='src/mongo/db/ftdc/file_manager.h' line='58' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManagerD1Ev'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='create'
> mangled-name='_ZN5mongo15FTDCFileManager6createEPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionEPNS_6ClientE'
> filepath='src/mongo/db/ftdc/file_manager.h' line='70' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager6createEPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionEPNS_6ClientE'>
> -            <parameter type-id='type-id-80'/>
> -            <parameter type-id='type-id-248'/>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-332'/>
> +            <parameter type-id='type-id-62'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-273'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
>            <function-decl name='scanDirectory'
> mangled-name='_ZN5mongo15FTDCFileManager13scanDirectoryEv'
> filepath='src/mongo/db/ftdc/file_manager.h' line='108' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager13scanDirectoryEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
>            <function-decl name='recoverInterimFile'
> mangled-name='_ZN5mongo15FTDCFileManager18recoverInterimFileEv'
> filepath='src/mongo/db/ftdc/file_manager.h' line='116' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager18recoverInterimFileEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='generateArchiveFileName'
> mangled-name='_ZN5mongo15FTDCFileManager23generateArchiveFileNameERKN5boost10filesystem4pathENS_10StringDataE'
> filepath='src/mongo/db/ftdc/file_manager.h' line='97' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager23generateArchiveFileNameERKN5boost10filesystem4pathENS_10StringDataE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-248'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
>            <function-decl name='openArchiveFile'
> mangled-name='_ZN5mongo15FTDCFileManager15openArchiveFileEPNS_6ClientERKN5boost10filesystem4pathERKSt6vectorISt5tupleIJNS_12FTDCBSONUtil8FTDCTypeENS_7BSONObjENS_6Date_tEEESaISE_EE'
> filepath='src/mongo/db/ftdc/file_manager.h' line='132' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager15openArchiveFileEPNS_6ClientERKN5boost10filesystem4pathERKSt6vectorISt5tupleIJNS_12FTDCBSONUtil8FTDCTypeENS_7BSONObjENS_6Date_tEEESaISE_EE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-332'/>
> -            <parameter type-id='type-id-248'/>
> -            <parameter type-id='type-id-252'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-273'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private'>
>            <function-decl name='trimDirectory'
> mangled-name='_ZN5mongo15FTDCFileManager13trimDirectoryERSt6vectorIN5boost10filesystem4pathESaIS4_EE'
> filepath='src/mongo/db/ftdc/file_manager.h' line='121' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager13trimDirectoryERSt6vectorIN5boost10filesystem4pathESaIS4_EE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-208'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='rotate'
> mangled-name='_ZN5mongo15FTDCFileManager6rotateEPNS_6ClientE'
> filepath='src/mongo/db/ftdc/file_manager.h' line='78' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager6rotateEPNS_6ClientE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-332'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-273'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='writeSampleAndRotateIfNeeded'
> mangled-name='_ZN5mongo15FTDCFileManager28writeSampleAndRotateIfNeededEPNS_6ClientERKNS_7BSONObjENS_6Date_tE'
> filepath='src/mongo/db/ftdc/file_manager.h' line='85' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo15FTDCFileManager28writeSampleAndRotateIfNeededEPNS_6ClientERKNS_7BSONObjENS_6Date_tE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-332'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-273'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
> @@ -7009,25 +6950,25 @@
>        <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
> -      <class-decl name='Client' size-in-bits='960' visibility='default'
> is-declaration-only='yes' id='type-id-331'/>
> +      <class-decl name='Client' size-in-bits='960' visibility='default'
> is-declaration-only='yes' id='type-id-272'/>
>        <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='getValue'
> mangled-name='_ZN5mongo10StatusWithIN5boost10filesystem4pathEE8getValueEv'
> filepath='src/mongo/base/status_with.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <return type-id='type-id-245'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__5' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='toString'
> mangled-name='_ZNK5mongo10StringData8toStringB5cxx11Ev'
> filepath='src/mongo/base/string_data.h' line='175' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-189'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-168'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='compare'
> mangled-name='_ZNK5mongo10StringData7compareES0_'
> filepath='src/mongo/base/string_data.h' line='125' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-13'/>
>            </function-decl>
> @@ -7043,14 +6984,14 @@
>        <class-decl name='__anonymous_struct__9' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='FTDCFileWriter'
> mangled-name='_ZN5mongo14FTDCFileWriterC2EPKNS_10FTDCConfigE'
> filepath='src/mongo/db/ftdc/file_writer.h' line='64' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileWriterC2EPKNS_10FTDCConfigE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-80'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-62'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='getSize'
> mangled-name='_ZNK5mongo14FTDCFileWriter7getSizeEv'
> filepath='src/mongo/db/ftdc/file_writer.h' line='91' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-47'/>
>            </function-decl>
>          </member-function>
> @@ -7069,7 +7010,7 @@
>        <class-decl name='__anonymous_struct__17' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='BlockCompressor'
> mangled-name='_ZN5mongo15BlockCompressorC2Ev'
> filepath='src/mongo/db/ftdc/block_compressor.h' line='47' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7077,13 +7018,13 @@
>        <class-decl name='__anonymous_struct__18' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__19' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-352'>
> +          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-293'>
>              <underlying-type type-id='type-id-18'/>
>            </enum-decl>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='FTDCFileReader'
> mangled-name='_ZN5mongo14FTDCFileReaderC2Ev'
> filepath='src/mongo/db/ftdc/file_reader.h' line='55' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileReaderC2Ev'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7091,16 +7032,16 @@
>        <class-decl name='__anonymous_struct__20' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='FTDCCompressor'
> mangled-name='_ZN5mongo14FTDCCompressorC2EPKNS_10FTDCConfigE'
> filepath='src/mongo/db/ftdc/compressor.h' line='82' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCCompressorC2EPKNS_10FTDCConfigE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-80'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-62'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>      </namespace-decl>
>      <namespace-decl name='mpl_'>
> -      <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' naming-typedef-id='type-id-341' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> -      <typedef-decl name='true_' type-id='type-id-24'
> filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='24'
> column='1' id='type-id-341'/>
> +      <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' naming-typedef-id='type-id-282' visibility='default'
> is-declaration-only='yes' id='type-id-24'/>
> +      <typedef-decl name='true_' type-id='type-id-24'
> filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='24'
> column='1' id='type-id-282'/>
>        <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>      </namespace-decl>
>      <namespace-decl name='mongoutils'>
> @@ -7108,9 +7049,9 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [2]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA2_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-325'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-266'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -7118,29 +7059,27 @@
>      </namespace-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='src/mongo/db/ftdc/file_reader.cpp'
> comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb'
> language='LANG_C_plus_plus'>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128'
> id='type-id-353'>
> -      <subrange length='16' type-id='type-id-5' id='type-id-354'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128'
> id='type-id-294'>
> +      <subrange length='16' type-id='type-id-5' id='type-id-295'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='152'
> id='type-id-355'>
> -      <subrange length='19' type-id='type-id-5' id='type-id-356'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='152'
> id='type-id-296'>
> +      <subrange length='19' type-id='type-id-5' id='type-id-297'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='280'
> id='type-id-357'>
> -      <subrange length='35' type-id='type-id-5' id='type-id-358'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='280'
> id='type-id-298'>
> +      <subrange length='35' type-id='type-id-5' id='type-id-299'/>
>      </array-type-def>
> -    <qualified-type-def type-id='type-id-359' const='yes'
> id='type-id-360'/>
> -    <pointer-type-def type-id='type-id-360' size-in-bits='64'
> id='type-id-361'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-353'
> size-in-bits='64' id='type-id-362'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-355'
> size-in-bits='64' id='type-id-363'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-357'
> size-in-bits='64' id='type-id-364'/>
> -    <qualified-type-def type-id='type-id-365' 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-124' const='yes'
> id='type-id-368'/>
> -    <pointer-type-def type-id='type-id-368' size-in-bits='64'
> id='type-id-171'/>
> -    <qualified-type-def type-id='type-id-128' const='yes'
> id='type-id-369'/>
> -    <pointer-type-def type-id='type-id-369' size-in-bits='64'
> id='type-id-169'/>
> -    <qualified-type-def type-id='type-id-113' const='yes'
> id='type-id-370'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-370'
> size-in-bits='64' id='type-id-371'/>
> -    <pointer-type-def type-id='type-id-372' size-in-bits='64'
> id='type-id-373'/>
> +    <qualified-type-def type-id='type-id-300' const='yes'
> id='type-id-301'/>
> +    <pointer-type-def type-id='type-id-301' size-in-bits='64'
> id='type-id-302'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-294'
> size-in-bits='64' id='type-id-303'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-296'
> size-in-bits='64' id='type-id-304'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-298'
> size-in-bits='64' id='type-id-305'/>
> +    <qualified-type-def type-id='type-id-306' const='yes'
> id='type-id-307'/>
> +    <pointer-type-def type-id='type-id-307' size-in-bits='64'
> id='type-id-308'/>
> +    <qualified-type-def type-id='type-id-107' const='yes'
> id='type-id-309'/>
> +    <pointer-type-def type-id='type-id-309' size-in-bits='64'
> id='type-id-153'/>
> +    <qualified-type-def type-id='type-id-111' const='yes'
> id='type-id-310'/>
> +    <pointer-type-def type-id='type-id-310' size-in-bits='64'
> id='type-id-151'/>
> +    <pointer-type-def type-id='type-id-311' size-in-bits='64'
> id='type-id-312'/>
>      <namespace-decl name='boost'>
>        <namespace-decl name='detail'>
>          <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
> @@ -7148,12 +7087,12 @@
>        <namespace-decl name='filesystem'>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-type access='private'>
> -            <typedef-decl name='value_type' type-id='type-id-2'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='67'
> column='1' id='type-id-359'/>
> +            <typedef-decl name='value_type' type-id='type-id-2'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='67'
> column='1' id='type-id-300'/>
>            </member-type>
>            <member-function access='public'>
>              <function-decl name='c_str'
> mangled-name='_ZNK5boost10filesystem4path5c_strEv'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='398' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-249' is-artificial='yes'/>
> -              <return type-id='type-id-361'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
> +              <return type-id='type-id-302'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -7184,44 +7123,44 @@
>      <namespace-decl name='std'>
>        <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <function-decl name='operator+&lt;char,
> std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;'
> mangled-name='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc'
> line='1151' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_'>
> -        <parameter type-id='type-id-66' name='__lhs'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc'
> line='1151' column='1'/>
> -        <parameter type-id='type-id-153' name='__rhs'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc'
> line='1152' column='1'/>
> -        <return type-id='type-id-87'/>
> +        <parameter type-id='type-id-64' name='__lhs'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc'
> line='1151' column='1'/>
> +        <parameter type-id='type-id-135' name='__rhs'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc'
> line='1152' column='1'/>
> +        <return type-id='type-id-77'/>
>        </function-decl>
> -      <class-decl name='basic_ifstream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='4160' visibility='default'
> is-declaration-only='yes' id='type-id-372'>
> +      <class-decl name='basic_ifstream&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='4160' visibility='default'
> is-declaration-only='yes' id='type-id-311'>
>          <member-function access='public'>
>            <function-decl name='close'
> mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE5closeEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='633' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-373' is-artificial='yes'/>
> +            <parameter type-id='type-id-312' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='is_open'
> mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='574' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-373' is-artificial='yes'/>
> +            <parameter type-id='type-id-312' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='open'
> mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='595' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-373' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-349'/>
> +            <parameter type-id='type-id-312' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-290'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' destructor='yes'
> vtable-offset='0'>
>            <function-decl name='~basic_ifstream'
> mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED1Ev'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='533' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-373' is-artificial='yes'/>
> +            <parameter type-id='type-id-312' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <class-decl name='ios_base' size-in-bits='1728'
> visibility='default' is-declaration-only='yes' id='type-id-374'>
> +      <class-decl name='ios_base' size-in-bits='1728'
> visibility='default' is-declaration-only='yes' id='type-id-313'>
>          <member-type access='private'>
> -          <typedef-decl name='iostate' type-id='type-id-165'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h'
> line='398' column='1' id='type-id-172'/>
> +          <typedef-decl name='iostate' type-id='type-id-147'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h'
> line='398' column='1' id='type-id-154'/>
>          </member-type>
>          <member-type access='private'>
> -          <typedef-decl name='openmode' type-id='type-id-375'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h'
> line='429' column='1' id='type-id-349'/>
> +          <typedef-decl name='openmode' type-id='type-id-314'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h'
> line='429' column='1' id='type-id-290'/>
>          </member-type>
>          <member-type access='private'>
>            <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
> @@ -7230,16 +7169,16 @@
>            <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>          </member-type>
>        </class-decl>
> -      <enum-decl name='__anonymous_enum__1' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-375'>
> +      <enum-decl name='__anonymous_enum__1' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-314'>
>          <underlying-type type-id='type-id-18'/>
>        </enum-decl>
> -      <typedef-decl name='streamsize' type-id='type-id-157'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h'
> line='98' column='1' id='type-id-170'/>
> +      <typedef-decl name='streamsize' type-id='type-id-139'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h'
> line='98' column='1' id='type-id-152'/>
>        <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='data'
> mangled-name='_ZNSt6vectorIcSaIcEE4dataEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='890' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <return type-id='type-id-59'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -7247,18 +7186,18 @@
>        <class-decl name='__anonymous_struct__4' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='protected' static='yes'>
>            <function-decl
> name='_M_allocate_and_copy&lt;__gnu_cxx::__normal_iterator&lt;const
> mongo::BSONObj *, std::vector&lt;mongo::BSONObj,
> std::allocator&lt;mongo::BSONObj&gt; &gt; &gt; &gt;'
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE20_M_allocate_and_copyIN9__gnu_cxx17__normal_iteratorIPKS1_S3_EEEEPS1_mT_SB_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1221' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-159'/>
> +            <return type-id='type-id-141'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator='
> mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEaSERKS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='436' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEaSERKS3_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-252'/>
> -            <return type-id='type-id-208'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -7278,10 +7217,10 @@
>        <class-decl name='__anonymous_struct__10' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
>        <class-decl name='__anonymous_struct__11' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__12' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
> -      <class-decl name='basic_filebuf&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default'
> is-declaration-only='yes' id='type-id-365'>
> +      <class-decl name='basic_filebuf&lt;char,
> std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default'
> is-declaration-only='yes' id='type-id-306'>
>          <member-function access='public'>
>            <function-decl name='is_open'
> mangled-name='_ZNKSt13basic_filebufIcSt11char_traitsIcEE7is_openEv'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream'
> line='252' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-367' is-artificial='yes'/>
> +            <parameter type-id='type-id-308' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
> @@ -7290,28 +7229,28 @@
>        <class-decl name='__anonymous_struct__14' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__uninit_copy&lt;mongo::BSONObj *,
> mongo::BSONObj *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN5mongo7BSONObjES4_EET0_T_S6_S5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='68' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-113'/>
> -            <return type-id='type-id-113'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__15' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__copy_m&lt;mongo::BSONObj *,
> mongo::BSONObj *&gt;'
> mangled-name='_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPN5mongo7BSONObjES5_EET0_T_S7_S6_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h'
> line='335' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-113'/>
> -            <return type-id='type-id-113'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='__copy_m&lt;const mongo::BSONObj *,
> mongo::BSONObj *&gt;'
> mangled-name='_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPKN5mongo7BSONObjEPS4_EET0_T_S9_S8_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h'
> line='335' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-80'/>
> -            <parameter type-id='type-id-80'/>
> -            <parameter type-id='type-id-113'/>
> -            <return type-id='type-id-113'/>
> +            <parameter type-id='type-id-62'/>
> +            <parameter type-id='type-id-62'/>
> +            <parameter type-id='type-id-55'/>
> +            <return type-id='type-id-55'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -7320,9 +7259,9 @@
>        <class-decl name='__anonymous_struct__18' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Tuple_impl&lt;mongo::BSONObj &amp;,
> mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm1EJRKN5mongo7BSONObjENS0_6Date_tEEEC2IRS1_JRS4_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7330,10 +7269,10 @@
>        <class-decl name='__anonymous_struct__19' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='_Tuple_impl&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj &amp;,
> mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeERKNS0_7BSONObjENS0_6Date_tEEEC2IS2_JRS3_RS6_EvEEOT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='211' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-335'/>
> -            <parameter type-id='type-id-116'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-276'/>
> +            <parameter type-id='type-id-53'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7341,10 +7280,10 @@
>        <class-decl name='__anonymous_struct__20' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='tuple&lt;mongo::FTDCBSONUtil::FTDCType,
> mongo::BSONObj &amp;, mongo::Date_t &amp;, void&gt;'
> mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeERKNS0_7BSONObjENS0_6Date_tEEEC2IJS2_RS3_RS6_EvEEDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='479' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-335'/>
> -            <parameter type-id='type-id-116'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-276'/>
> +            <parameter type-id='type-id-53'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7352,8 +7291,8 @@
>        <class-decl name='__anonymous_struct__21' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='_Head_base&lt;mongo::BSONObj &amp;&gt;'
> mangled-name='_ZNSt10_Head_baseILm1ERKN5mongo7BSONObjELb0EEC2IRS1_EEOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple'
> line='114' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-53'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7363,19 +7302,19 @@
>        <class-decl name='__anonymous_struct__24' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__uninit_default_n&lt;char *, unsigned
> long&gt;'
> mangled-name='_ZNSt27__uninitialized_default_n_1ILb1EE18__uninit_default_nIPcmEET_S3_T0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='535' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-59'/>
> +            <parameter type-id='type-id-56'/>
>              <parameter type-id='type-id-21'/>
> -            <return type-id='type-id-59'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__25' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__copy_m&lt;char&gt;'
> mangled-name='_ZNSt11__copy_moveILb1ELb1ESt26random_access_iterator_tagE8__copy_mIcEEPT_PKS3_S6_S4_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h'
> line='373' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-59'/>
> -            <return type-id='type-id-59'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-56'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -7384,8 +7323,8 @@
>            <function-decl
> name='__uninit_copy&lt;std::move_iterator&lt;char *&gt;, char *&gt;'
> mangled-name='_ZNSt20__uninitialized_copyILb1EE13__uninit_copyISt13move_iteratorIPcES3_EET0_T_S6_S5_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h'
> line='91' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-59'/>
> -            <return type-id='type-id-59'/>
> +            <parameter type-id='type-id-56'/>
> +            <return type-id='type-id-56'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -7402,8 +7341,8 @@
>        <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='__normal_iterator'
> mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo7BSONObjESt6vectorIS2_SaIS2_EEEC2ERKS3_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h'
> line='740' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-371'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-162'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7437,32 +7376,32 @@
>        <class-decl name='__anonymous_struct__6' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~FTDCFileReader'
> mangled-name='_ZN5mongo14FTDCFileReaderD2Ev'
> filepath='src/mongo/db/ftdc/file_reader.h' line='56' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileReaderD2Ev'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='hasNext'
> mangled-name='_ZN5mongo14FTDCFileReader7hasNextEv'
> filepath='src/mongo/db/ftdc/file_reader.h' line='68' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileReader7hasNextEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='readDocument'
> mangled-name='_ZN5mongo14FTDCFileReader12readDocumentEv'
> filepath='src/mongo/db/ftdc/file_reader.h' line='81' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileReader12readDocumentEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='next'
> mangled-name='_ZN5mongo15BSONObjIterator4nextEv'
> filepath='src/mongo/db/ftdc/file_reader.h' line='75' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileReader4nextEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='open'
> mangled-name='_ZN5mongo14FTDCFileWriter4openERKN5boost10filesystem4pathE'
> filepath='src/mongo/db/ftdc/file_reader.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileReader4openERKN5boost10filesystem4pathE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-248'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
> @@ -7475,7 +7414,7 @@
>        <class-decl name='__anonymous_struct__8' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public'>
>            <function-decl name='StatusWith'
> mangled-name='_ZN5mongo10StatusWithIbEC2Eb'
> filepath='src/mongo/base/status_with.h' line='92' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-1'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -7485,8 +7424,8 @@
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='getValue'
> mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEE8getValueEv'
> filepath='src/mongo/base/status_with.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <return type-id='type-id-334'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-275'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -7515,15 +7454,15 @@
>        <class-decl name='__anonymous_struct__20' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='read&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;'
> mangled-name='_ZNK5mongo14ConstDataRange4readINS_9ValidatedINS_7BSONObjEEEEENS_6StatusEPT_m'
> filepath='src/mongo/base/data_range.h' line='73' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <parameter type-id='type-id-26'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='read&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;'
> mangled-name='_ZNK5mongo14ConstDataRange4readINS_9ValidatedINS_7BSONObjEEEEENS_10StatusWithIT_EEm'
> filepath='src/mongo/base/data_range.h' line='83' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo14ConstDataRange4readINS_9ValidatedINS_7BSONObjEEEEENS_10StatusWithIT_EEm'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
> @@ -7539,23 +7478,23 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [35]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA35_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-364'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-305'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [16]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA16_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-362'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-303'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [19]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA19_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-363'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-304'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -7563,10 +7502,10 @@
>      </namespace-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='src/mongo/db/ftdc/file_writer.cpp'
> comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb'
> language='LANG_C_plus_plus'>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='632'
> id='type-id-376'>
> -      <subrange length='79' type-id='type-id-5' id='type-id-377'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='632'
> id='type-id-315'>
> +      <subrange length='79' type-id='type-id-5' id='type-id-316'/>
>      </array-type-def>
> -    <reference-type-def kind='lvalue' type-id='type-id-376'
> size-in-bits='64' id='type-id-378'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-315'
> size-in-bits='64' id='type-id-317'/>
>      <namespace-decl name='boost'>
>        <namespace-decl name='filesystem'>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
> @@ -7575,29 +7514,29 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='protected'>
>              <function-decl name='optional_base'
> mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2ENS_6none_tE'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='245' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <parameter type-id='type-id-24'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='protected'>
>              <function-decl name='construct'
> mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEE9constructERKS3_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='472' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <parameter type-id='type-id-379'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-318'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='protected'>
>              <function-decl name='optional_base'
> mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2ERKS3_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='251' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-58' is-artificial='yes'/>
> -              <parameter type-id='type-id-379'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-318'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>          <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>            <member-type access='public'>
> -            <typedef-decl name='argument_type' type-id='type-id-188'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='164' column='1' id='type-id-379'/>
> +            <typedef-decl name='argument_type' type-id='type-id-61'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='164' column='1' id='type-id-318'/>
>            </member-type>
>          </class-decl>
>          <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
> @@ -7611,19 +7550,19 @@
>        </namespace-decl>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='argument_type' type-id='type-id-379'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='782' column='1' id='type-id-380'/>
> +          <typedef-decl name='argument_type' type-id='type-id-318'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='782' column='1' id='type-id-319'/>
>          </member-type>
>          <member-function access='public'>
>            <function-decl name='optional'
> mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2ENS_6none_tE'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='790' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='optional'
> mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2ERKS2_'
> filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp'
> line='794' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-57' is-artificial='yes'/>
> -            <parameter type-id='type-id-380'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-319'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7653,7 +7592,7 @@
>        <namespace-decl name='logger'>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-type access='private'>
> -            <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-381'>
> +            <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-320'>
>                <underlying-type type-id='type-id-18'/>
>              </enum-decl>
>            </member-type>
> @@ -7668,51 +7607,51 @@
>        <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes' destructor='yes'>
>            <function-decl name='~FTDCFileWriter'
> mangled-name='_ZN5mongo14FTDCFileWriterD2Ev'
> filepath='src/mongo/db/ftdc/file_writer.h' line='65' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileWriterD2Ev'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='writeInterimFileBuffer'
> mangled-name='_ZN5mongo14FTDCFileWriter22writeInterimFileBufferENS_14ConstDataRangeE'
> filepath='src/mongo/db/ftdc/file_writer.h' line='111' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileWriter22writeInterimFileBufferENS_14ConstDataRangeE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='writeArchiveFileBuffer'
> mangled-name='_ZN5mongo14FTDCFileWriter22writeArchiveFileBufferENS_14ConstDataRangeE'
> filepath='src/mongo/db/ftdc/file_writer.h' line='116' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileWriter22writeArchiveFileBufferENS_14ConstDataRangeE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='writeMetadata'
> mangled-name='_ZN5mongo14FTDCFileWriter13writeMetadataERKNS_7BSONObjENS_6Date_tE'
> filepath='src/mongo/db/ftdc/file_writer.h' line='75' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileWriter13writeMetadataERKNS_7BSONObjENS_6Date_tE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='writeSample'
> mangled-name='_ZN5mongo14FTDCFileWriter11writeSampleERKNS_7BSONObjENS_6Date_tE'
> filepath='src/mongo/db/ftdc/file_writer.h' line='80' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileWriter11writeSampleERKNS_7BSONObjENS_6Date_tE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='flush'
> mangled-name='_ZN5mongo14FTDCFileWriter5flushERKN5boost8optionalINS_14ConstDataRangeEEENS_6Date_tE'
> filepath='src/mongo/db/ftdc/file_writer.h' line='106' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileWriter5flushERKN5boost8optionalINS_14ConstDataRangeEEENS_6Date_tE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-183'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-24'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='closeWithoutFlushForTest'
> mangled-name='_ZN5mongo14FTDCFileWriter24closeWithoutFlushForTestEv'
> filepath='src/mongo/db/ftdc/file_writer.h' line='100' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14FTDCFileWriter24closeWithoutFlushForTestEv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7731,19 +7670,19 @@
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <class-decl name='__anonymous_struct__11' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-382'>
> +          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-321'>
>              <underlying-type type-id='type-id-18'/>
>            </enum-decl>
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='getSampleCount'
> mangled-name='_ZNK5mongo14FTDCCompressor14getSampleCountEv'
> filepath='src/mongo/db/ftdc/compressor.h' line='104' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-47'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='hasDataToFlush'
> mangled-name='_ZNK5mongo14FTDCCompressor14hasDataToFlushEv'
> filepath='src/mongo/db/ftdc/compressor.h' line='118' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
> @@ -7762,8 +7701,8 @@
>        <class-decl name='__anonymous_struct__16' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='getValue'
> mangled-name='_ZN5mongo10StatusWithIN5boost8optionalISt5tupleIJNS_14ConstDataRangeENS_14FTDCCompressor15CompressorStateENS_6Date_tEEEEEE8getValueEv'
> filepath='src/mongo/base/status_with.h' line='99' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <return type-id='type-id-55'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> @@ -7789,9 +7728,9 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [79]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA79_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-378'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-317'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -7799,55 +7738,55 @@
>      </namespace-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='src/mongo/db/ftdc/util.cpp'
> comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb'
> language='LANG_C_plus_plus'>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='32'
> id='type-id-383'>
> -      <subrange length='4' type-id='type-id-5' id='type-id-384'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='32'
> id='type-id-322'>
> +      <subrange length='4' type-id='type-id-5' id='type-id-323'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='40'
> id='type-id-385'>
> -      <subrange length='5' type-id='type-id-5' id='type-id-386'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='40'
> id='type-id-324'>
> +      <subrange length='5' type-id='type-id-5' id='type-id-325'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='48'
> id='type-id-387'>
> -      <subrange length='6' type-id='type-id-5' id='type-id-388'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='48'
> id='type-id-326'>
> +      <subrange length='6' type-id='type-id-5' id='type-id-327'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='56'
> id='type-id-389'>
> -      <subrange length='7' type-id='type-id-5' id='type-id-390'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='56'
> id='type-id-328'>
> +      <subrange length='7' type-id='type-id-5' id='type-id-329'/>
>      </array-type-def>
> -    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='64'
> id='type-id-391'>
> -      <subrange length='8' type-id='type-id-5' id='type-id-392'/>
> +    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='64'
> id='type-id-330'>
> +      <subrange length='8' type-id='type-id-5' id='type-id-331'/>
>      </array-type-def>
> -    <type-decl name='signed char' size-in-bits='8' id='type-id-393'/>
> -    <qualified-type-def type-id='type-id-220' const='yes'
> id='type-id-394'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-394'
> size-in-bits='64' id='type-id-395'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-389'
> size-in-bits='64' id='type-id-396'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-391'
> size-in-bits='64' id='type-id-397'/>
> -    <qualified-type-def type-id='type-id-16' const='yes'
> id='type-id-398'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-398'
> size-in-bits='64' id='type-id-399'/>
> -    <reference-type-def kind='lvalue' type-id='type-id-13'
> size-in-bits='64' id='type-id-400'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-16'
> size-in-bits='64' id='type-id-401'/>
> -    <pointer-type-def type-id='type-id-16' size-in-bits='64'
> id='type-id-402'/>
> -    <pointer-type-def type-id='type-id-17' size-in-bits='64'
> id='type-id-403'/>
> -    <pointer-type-def type-id='type-id-393' size-in-bits='64'
> id='type-id-404'/>
> -    <reference-type-def kind='rvalue' type-id='type-id-20'
> size-in-bits='64' id='type-id-405'/>
> +    <type-decl name='signed char' size-in-bits='8' id='type-id-332'/>
> +    <qualified-type-def type-id='type-id-195' const='yes'
> id='type-id-333'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-333'
> size-in-bits='64' id='type-id-334'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-328'
> size-in-bits='64' id='type-id-335'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-330'
> size-in-bits='64' id='type-id-336'/>
> +    <qualified-type-def type-id='type-id-16' const='yes'
> id='type-id-337'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-337'
> size-in-bits='64' id='type-id-338'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-13'
> size-in-bits='64' id='type-id-339'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-16'
> size-in-bits='64' id='type-id-340'/>
> +    <pointer-type-def type-id='type-id-16' size-in-bits='64'
> id='type-id-341'/>
> +    <pointer-type-def type-id='type-id-17' size-in-bits='64'
> id='type-id-342'/>
> +    <pointer-type-def type-id='type-id-332' size-in-bits='64'
> id='type-id-343'/>
> +    <reference-type-def kind='rvalue' type-id='type-id-20'
> size-in-bits='64' id='type-id-344'/>
>      <namespace-decl name='boost'>
>        <namespace-decl name='filesystem'>
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='path'
> mangled-name='_ZN5boost10filesystem4pathC2EPKc'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='143' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-361'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-302'/>
>                <return type-id='type-id-22'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='has_extension'
> mangled-name='_ZNK5boost10filesystem4path13has_extensionEv'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='519' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-249' is-artificial='yes'/>
> +              <parameter type-id='type-id-62' is-artificial='yes'/>
>                <return type-id='type-id-1'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator='
> mangled-name='_ZN5boost10filesystem4pathaSERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE'
> filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp'
> line='212' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -              <parameter type-id='type-id-246' is-artificial='yes'/>
> -              <parameter type-id='type-id-320'/>
> -              <return type-id='type-id-245'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-265'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -7873,54 +7812,54 @@
>      <namespace-decl name='std'>
>        <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <typedef-decl name='const_reference' type-id='type-id-407'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='230' column='1' id='type-id-406'/>
> +          <typedef-decl name='const_reference' type-id='type-id-346'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='230' column='1' id='type-id-345'/>
>          </member-type>
>          <member-function access='public'>
>            <function-decl name='emplace_back&lt;unsigned int&gt;'
> mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJjEEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='936' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-405'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-344'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='emplace_back&lt;long long&gt;'
> mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJxEEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='936' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-401'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-340'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='emplace_back&lt;bool&gt;'
> mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJbEEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='936' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-300'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-257'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
>            <function-decl name='operator[]'
> mangled-name='_ZNKSt6vectorImSaImEEixEm'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='794' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-86' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <parameter type-id='type-id-48'/>
> -            <return type-id='type-id-406'/>
> +            <return type-id='type-id-345'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected'>
>            <function-decl name='_M_emplace_back_aux&lt;long long&gt;'
> mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJxEEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1417' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJxEEEvDpOT_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-401'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-340'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected'>
>            <function-decl name='_M_emplace_back_aux&lt;bool&gt;'
> mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJbEEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1417' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJbEEEvDpOT_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-300'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-257'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='protected'>
>            <function-decl name='_M_emplace_back_aux&lt;unsigned int&gt;'
> mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJjEEEvDpOT_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h'
> line='1417' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJjEEEvDpOT_'>
> -            <parameter type-id='type-id-119' is-artificial='yes'/>
> -            <parameter type-id='type-id-405'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-344'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7928,25 +7867,25 @@
>        <class-decl name='__anonymous_struct__1' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;unsigned long, bool&gt;'
> mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJbEEEvRS0_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-234'/>
> -            <parameter type-id='type-id-300'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-257'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;unsigned long, long long&gt;'
> mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJxEEEvRS0_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-234'/>
> -            <parameter type-id='type-id-401'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-340'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;unsigned long, unsigned
> int&gt;'
> mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJjEEEvRS0_PT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h'
> line='529' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-121'/>
> -            <parameter type-id='type-id-234'/>
> -            <parameter type-id='type-id-405'/>
> +            <parameter type-id='type-id-104'/>
> +            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-344'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -7973,44 +7912,44 @@
>          <class-decl name='__anonymous_struct__1' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsENS_10StringDataE'
> filepath='src/mongo/logger/logstream_builder.h' line='131' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <parameter type-id='type-id-24'/>
> -              <return type-id='type-id-261'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEi'
> filepath='src/mongo/logger/logstream_builder.h' line='143' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-260' is-artificial='yes'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
>                <parameter type-id='type-id-13'/>
> -              <return type-id='type-id-261'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
>          <class-decl name='__anonymous_struct__2' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        </namespace-decl>
> -      <var-decl name='kFTDCInterimFile' type-id='type-id-353'
> mangled-name='_ZN5mongo16kFTDCInterimFileE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='51' column='1'
> elf-symbol-id='_ZN5mongo16kFTDCInterimFileE'/>
> -      <var-decl name='kFTDCArchiveFile' type-id='type-id-391'
> mangled-name='_ZN5mongo16kFTDCArchiveFileE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='53' column='1'
> elf-symbol-id='_ZN5mongo16kFTDCArchiveFileE'/>
> -      <var-decl name='kFTDCIdField' type-id='type-id-383'
> mangled-name='_ZN5mongo12kFTDCIdFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='55' column='1'
> elf-symbol-id='_ZN5mongo12kFTDCIdFieldE'/>
> -      <var-decl name='kFTDCTypeField' type-id='type-id-385'
> mangled-name='_ZN5mongo14kFTDCTypeFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='56' column='1'
> elf-symbol-id='_ZN5mongo14kFTDCTypeFieldE'/>
> -      <var-decl name='kFTDCDataField' type-id='type-id-385'
> mangled-name='_ZN5mongo14kFTDCDataFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='58' column='1'
> elf-symbol-id='_ZN5mongo14kFTDCDataFieldE'/>
> -      <var-decl name='kFTDCDocField' type-id='type-id-383'
> mangled-name='_ZN5mongo13kFTDCDocFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='59' column='1'
> elf-symbol-id='_ZN5mongo13kFTDCDocFieldE'/>
> -      <var-decl name='kFTDCDocsField' type-id='type-id-385'
> mangled-name='_ZN5mongo14kFTDCDocsFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='61' column='1'
> elf-symbol-id='_ZN5mongo14kFTDCDocsFieldE'/>
> -      <var-decl name='kFTDCCollectStartField' type-id='type-id-387'
> mangled-name='_ZN5mongo22kFTDCCollectStartFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='63' column='1'
> elf-symbol-id='_ZN5mongo22kFTDCCollectStartFieldE'/>
> -      <var-decl name='kFTDCCollectEndField' type-id='type-id-383'
> mangled-name='_ZN5mongo20kFTDCCollectEndFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='64' column='1'
> elf-symbol-id='_ZN5mongo20kFTDCCollectEndFieldE'/>
> +      <var-decl name='kFTDCInterimFile' type-id='type-id-294'
> mangled-name='_ZN5mongo16kFTDCInterimFileE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='51' column='1'
> elf-symbol-id='_ZN5mongo16kFTDCInterimFileE'/>
> +      <var-decl name='kFTDCArchiveFile' type-id='type-id-330'
> mangled-name='_ZN5mongo16kFTDCArchiveFileE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='53' column='1'
> elf-symbol-id='_ZN5mongo16kFTDCArchiveFileE'/>
> +      <var-decl name='kFTDCIdField' type-id='type-id-322'
> mangled-name='_ZN5mongo12kFTDCIdFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='55' column='1'
> elf-symbol-id='_ZN5mongo12kFTDCIdFieldE'/>
> +      <var-decl name='kFTDCTypeField' type-id='type-id-324'
> mangled-name='_ZN5mongo14kFTDCTypeFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='56' column='1'
> elf-symbol-id='_ZN5mongo14kFTDCTypeFieldE'/>
> +      <var-decl name='kFTDCDataField' type-id='type-id-324'
> mangled-name='_ZN5mongo14kFTDCDataFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='58' column='1'
> elf-symbol-id='_ZN5mongo14kFTDCDataFieldE'/>
> +      <var-decl name='kFTDCDocField' type-id='type-id-322'
> mangled-name='_ZN5mongo13kFTDCDocFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='59' column='1'
> elf-symbol-id='_ZN5mongo13kFTDCDocFieldE'/>
> +      <var-decl name='kFTDCDocsField' type-id='type-id-324'
> mangled-name='_ZN5mongo14kFTDCDocsFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='61' column='1'
> elf-symbol-id='_ZN5mongo14kFTDCDocsFieldE'/>
> +      <var-decl name='kFTDCCollectStartField' type-id='type-id-326'
> mangled-name='_ZN5mongo22kFTDCCollectStartFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='63' column='1'
> elf-symbol-id='_ZN5mongo22kFTDCCollectStartFieldE'/>
> +      <var-decl name='kFTDCCollectEndField' type-id='type-id-322'
> mangled-name='_ZN5mongo20kFTDCCollectEndFieldE' visibility='default'
> filepath='src/mongo/db/ftdc/util.cpp' line='64' column='1'
> elf-symbol-id='_ZN5mongo20kFTDCCollectEndFieldE'/>
>        <namespace-decl name='FTDCBSONUtil'>
>          <function-decl name='extractMetricsFromDocument'
> mangled-name='_ZN5mongo12FTDCBSONUtil26extractMetricsFromDocumentERKNS_7BSONObjES3_PSt6vectorImSaImEE'
> filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo12FTDCBSONUtil26extractMetricsFromDocumentERKNS_7BSONObjES3_PSt6vectorImSaImEE'>
> -          <parameter type-id='type-id-188' name='referenceDoc'
> filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1'/>
> -          <parameter type-id='type-id-188' name='currentDoc'
> filepath='src/mongo/db/ftdc/util.cpp' line='234' column='1'/>
> -          <parameter type-id='type-id-119' name='metrics'
> filepath='src/mongo/db/ftdc/util.cpp' line='235' column='1'/>
> +          <parameter type-id='type-id-61' name='referenceDoc'
> filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1'/>
> +          <parameter type-id='type-id-61' name='currentDoc'
> filepath='src/mongo/db/ftdc/util.cpp' line='234' column='1'/>
> +          <parameter type-id='type-id-55' name='metrics'
> filepath='src/mongo/db/ftdc/util.cpp' line='235' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='constructDocumentFromMetrics'
> mangled-name='_ZN5mongo12FTDCBSONUtil28constructDocumentFromMetricsERKNS_7BSONObjERKSt6vectorImSaImEE'
> filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo12FTDCBSONUtil28constructDocumentFromMetricsERKNS_7BSONObjERKSt6vectorImSaImEE'>
> -          <parameter type-id='type-id-188' name='ref'
> filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'/>
> -          <parameter type-id='type-id-252' name='metrics'
> filepath='src/mongo/db/ftdc/util.cpp' line='335' column='1'/>
> +          <parameter type-id='type-id-61' name='ref'
> filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'/>
> +          <parameter type-id='type-id-61' name='metrics'
> filepath='src/mongo/db/ftdc/util.cpp' line='335' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='createBSONMetadataDocument'
> mangled-name='_ZN5mongo12FTDCBSONUtil26createBSONMetadataDocumentERKNS_7BSONObjENS_6Date_tE'
> filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo12FTDCBSONUtil26createBSONMetadataDocumentERKNS_7BSONObjENS_6Date_tE'>
> -          <parameter type-id='type-id-188' name='metadata'
> filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
> +          <parameter type-id='type-id-61' name='metadata'
> filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
>            <parameter type-id='type-id-24' name='date'
> filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
> @@ -8020,20 +7959,20 @@
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='getBSONDocumentId'
> mangled-name='_ZN5mongo12FTDCBSONUtil17getBSONDocumentIdERKNS_7BSONObjE'
> filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo12FTDCBSONUtil17getBSONDocumentIdERKNS_7BSONObjE'>
> -          <parameter type-id='type-id-188' name='obj'
> filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
> +          <parameter type-id='type-id-61' name='obj'
> filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='getBSONDocumentType'
> mangled-name='_ZN5mongo12FTDCBSONUtil19getBSONDocumentTypeERKNS_7BSONObjE'
> filepath='src/mongo/db/ftdc/util.cpp' line='376' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo12FTDCBSONUtil19getBSONDocumentTypeERKNS_7BSONObjE'>
> -          <parameter type-id='type-id-188' name='obj'
> filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
> +          <parameter type-id='type-id-61' name='obj'
> filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='getBSONDocumentFromMetadataDoc'
> mangled-name='_ZN5mongo12FTDCBSONUtil30getBSONDocumentFromMetadataDocERKNS_7BSONObjE'
> filepath='src/mongo/db/ftdc/util.cpp' line='396' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo12FTDCBSONUtil30getBSONDocumentFromMetadataDocERKNS_7BSONObjE'>
> -          <parameter type-id='type-id-188' name='obj'
> filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
> +          <parameter type-id='type-id-61' name='obj'
> filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='getMetricsFromMetricDoc'
> mangled-name='_ZN5mongo12FTDCBSONUtil23getMetricsFromMetricDocERKNS_7BSONObjEPNS_16FTDCDecompressorE'
> filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo12FTDCBSONUtil23getMetricsFromMetricDocERKNS_7BSONObjEPNS_16FTDCDecompressorE'>
> -          <parameter type-id='type-id-188' name='obj'
> filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1'/>
> -          <parameter type-id='type-id-113' name='decompressor'
> filepath='src/mongo/db/ftdc/util.cpp' line='413' column='1'/>
> +          <parameter type-id='type-id-61' name='obj'
> filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1'/>
> +          <parameter type-id='type-id-55' name='decompressor'
> filepath='src/mongo/db/ftdc/util.cpp' line='413' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>        </namespace-decl>
> @@ -8047,20 +7986,20 @@
>        <class-decl name='__anonymous_struct__7' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
>        <namespace-decl name='FTDCUtil'>
>          <function-decl name='getInterimFile'
> mangled-name='_ZN5mongo8FTDCUtil14getInterimFileERKN5boost10filesystem4pathE'
> filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo8FTDCUtil14getInterimFileERKN5boost10filesystem4pathE'>
> -          <parameter type-id='type-id-248' name='file'
> filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
> +          <parameter type-id='type-id-61' name='file'
> filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='getInterimTempFile'
> mangled-name='_ZN5mongo8FTDCUtil18getInterimTempFileERKN5boost10filesystem4pathE'
> filepath='src/mongo/db/ftdc/util.cpp' line='89' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo8FTDCUtil18getInterimTempFileERKN5boost10filesystem4pathE'>
> -          <parameter type-id='type-id-248' name='file'
> filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
> +          <parameter type-id='type-id-61' name='file'
> filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='roundTime'
> mangled-name='_ZN5mongo8FTDCUtil9roundTimeENS_6Date_tENS_8DurationISt5ratioILl1ELl1000EEEE'
> filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo8FTDCUtil9roundTimeENS_6Date_tENS_8DurationISt5ratioILl1ELl1000EEEE'>
>            <parameter type-id='type-id-24' name='now'
> filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
> -          <parameter type-id='type-id-290' name='period'
> filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
> +          <parameter type-id='type-id-247' name='period'
> filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>          <function-decl name='getMongoSPath'
> mangled-name='_ZN5mongo8FTDCUtil13getMongoSPathERKN5boost10filesystem4pathE'
> filepath='src/mongo/db/ftdc/util.cpp' line='106' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo8FTDCUtil13getMongoSPathERKN5boost10filesystem4pathE'>
> -          <parameter type-id='type-id-248' name='file'
> filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
> +          <parameter type-id='type-id-61' name='file'
> filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
>            <return type-id='type-id-24'/>
>          </function-decl>
>        </namespace-decl>
> @@ -8073,14 +8012,14 @@
>        <class-decl name='__anonymous_struct__10' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONObjIterator'
> mangled-name='_ZN5mongo15BSONObjIteratorC2ERKNS_7BSONObjE'
> filepath='src/mongo/bson/bsonobj.h' line='597' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='more'
> mangled-name='_ZN5mongo15BSONObjIterator4moreEv'
> filepath='src/mongo/bson/bsonobj.h' line='619' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
> @@ -8096,17 +8035,17 @@
>            <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeLoad'
> mangled-name='_ZN5mongo8DataType7HandlerIxvE10unsafeLoadEPxPKcPm'
> filepath='src/mongo/base/data_type.h' line='59' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-402'/>
> -                <parameter type-id='type-id-66'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-341'/>
> +                <parameter type-id='type-id-64'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeStore'
> mangled-name='_ZN5mongo8DataType7HandlerIxvE11unsafeStoreERKxPcPm'
> filepath='src/mongo/base/data_type.h' line='87' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-399'/>
> -                <parameter type-id='type-id-59'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-338'/>
> +                <parameter type-id='type-id-56'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -8119,9 +8058,9 @@
>            <class-decl name='__anonymous_struct__4' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeLoad'
> mangled-name='_ZN5mongo8DataType7HandlerIyvE10unsafeLoadEPyPKcPm'
> filepath='src/mongo/base/data_type.h' line='59' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-403'/>
> -                <parameter type-id='type-id-66'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-342'/>
> +                <parameter type-id='type-id-64'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -8134,9 +8073,9 @@
>            <class-decl name='__anonymous_struct__6' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='unsafeLoad'
> mangled-name='_ZN5mongo8DataType7HandlerIavE10unsafeLoadEPaPKcPm'
> filepath='src/mongo/base/data_type.h' line='59' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -                <parameter type-id='type-id-404'/>
> -                <parameter type-id='type-id-66'/>
> -                <parameter type-id='type-id-204'/>
> +                <parameter type-id='type-id-343'/>
> +                <parameter type-id='type-id-64'/>
> +                <parameter type-id='type-id-183'/>
>                  <return type-id='type-id-22'/>
>                </function-decl>
>              </member-function>
> @@ -8150,57 +8089,57 @@
>          </member-type>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeLoad&lt;long long&gt;'
> mangled-name='_ZN5mongo8DataType10unsafeLoadIxEEvPT_PKcPm'
> filepath='src/mongo/base/data_type.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-402'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-341'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeLoad&lt;mongo::LittleEndian&lt;long
> long&gt; &gt;'
> mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIxEEEEvPT_PKcPm'
> filepath='src/mongo/base/data_type.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeLoad&lt;unsigned long long&gt;'
> mangled-name='_ZN5mongo8DataType10unsafeLoadIyEEvPT_PKcPm'
> filepath='src/mongo/base/data_type.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-403'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-342'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl
> name='unsafeLoad&lt;mongo::LittleEndian&lt;unsigned long long&gt; &gt;'
> mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIyEEEEvPT_PKcPm'
> filepath='src/mongo/base/data_type.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-55'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeLoad&lt;signed char&gt;'
> mangled-name='_ZN5mongo8DataType10unsafeLoadIaEEvPT_PKcPm'
> filepath='src/mongo/base/data_type.h' line='150' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-404'/>
> -            <parameter type-id='type-id-66'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-343'/>
> +            <parameter type-id='type-id-64'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeStore&lt;long long&gt;'
> mangled-name='_ZN5mongo8DataType11unsafeStoreIxEEvRKT_PcPm'
> filepath='src/mongo/base/data_type.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-399'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-338'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;long
> long&gt; &gt;'
> mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIxEEEEvRKT_PcPm'
> filepath='src/mongo/base/data_type.h' line='155' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-188'/>
> -            <parameter type-id='type-id-59'/>
> -            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-61'/>
> +            <parameter type-id='type-id-56'/>
> +            <parameter type-id='type-id-183'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -8208,188 +8147,188 @@
>        <class-decl name='__anonymous_struct__12' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='read&lt;mongo::LittleEndian&lt;long
> long&gt; &gt;'
> mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIxEEEERKS0_PT_m'
> filepath='src/mongo/base/data_view.h' line='50' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <parameter type-id='type-id-26'/>
> -            <return type-id='type-id-188'/>
> +            <return type-id='type-id-61'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='read&lt;mongo::LittleEndian&lt;long
> long&gt; &gt;'
> mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIxEEEET_m'
> filepath='src/mongo/base/data_view.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='read&lt;mongo::LittleEndian&lt;unsigned
> long long&gt; &gt;'
> mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIyEEEERKS0_PT_m'
> filepath='src/mongo/base/data_view.h' line='50' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <parameter type-id='type-id-113'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-55'/>
>              <parameter type-id='type-id-26'/>
> -            <return type-id='type-id-188'/>
> +            <return type-id='type-id-61'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='read&lt;mongo::LittleEndian&lt;unsigned
> long long&gt; &gt;'
> mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIyEEEET_m'
> filepath='src/mongo/base/data_view.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='read&lt;signed char&gt;'
> mangled-name='_ZNK5mongo13ConstDataView4readIaEERKS0_PT_m'
> filepath='src/mongo/base/data_view.h' line='50' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <parameter type-id='type-id-404'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-343'/>
>              <parameter type-id='type-id-26'/>
> -            <return type-id='type-id-188'/>
> +            <return type-id='type-id-61'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='read&lt;signed char&gt;'
> mangled-name='_ZNK5mongo13ConstDataView4readIaEET_m'
> filepath='src/mongo/base/data_view.h' line='57' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <parameter type-id='type-id-47'/>
> -            <return type-id='type-id-393'/>
> +            <return type-id='type-id-332'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__13' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONElement'
> mangled-name='_ZN5mongo11BSONElementC2Ev'
> filepath='src/mongo/bson/bsonelement.h' line='560' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='BSONElement'
> mangled-name='_ZN5mongo11BSONElementC2EPKc'
> filepath='src/mongo/bson/bsonelement.h' line='657' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-64'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='eoo'
> mangled-name='_ZNK5mongo11BSONElement3eooEv'
> filepath='src/mongo/bson/bsonelement.h' line='224' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='fieldName'
> mangled-name='_ZNK5mongo11BSONElement9fieldNameEv'
> filepath='src/mongo/bson/bsonelement.h' line='244' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-66'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-64'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='fieldNameStringData'
> mangled-name='_ZNK5mongo11BSONElement19fieldNameStringDataEv'
> filepath='src/mongo/bson/bsonelement.h' line='259' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-79'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-60'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='fieldNameSize'
> mangled-name='_ZNK5mongo11BSONElement13fieldNameSizeEv'
> filepath='src/mongo/bson/bsonelement.h' line='253' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-13'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='value'
> mangled-name='_ZNK5mongo11BSONElement5valueEv'
> filepath='src/mongo/bson/bsonelement.h' line='264' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-66'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-64'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='boolean'
> mangled-name='_ZNK5mongo11BSONElement7booleanEv'
> filepath='src/mongo/bson/bsonelement.h' line='279' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='Bool'
> mangled-name='_ZNK5mongo11BSONElement4BoolEv'
> filepath='src/mongo/bson/bsonelement.h' line='125' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='type'
> mangled-name='_ZNK5mongo11BSONElement4typeEv'
> filepath='src/mongo/bson/bsonelement.h' line='206' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-408'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-347'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='isNumber'
> mangled-name='_ZNK5mongo11BSONElement8isNumberEv'
> filepath='src/mongo/bson/bsonelement.h' line='301' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-1'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='timestamp'
> mangled-name='_ZNK5mongo11BSONElement9timestampEv'
> filepath='src/mongo/bson/bsonelement.h' line='585' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='Date'
> mangled-name='_ZNK5mongo11BSONElement4DateEv'
> filepath='src/mongo/bson/bsonelement.h' line='102' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='date'
> mangled-name='_ZNK5mongo11BSONElement4dateEv'
> filepath='src/mongo/bson/bsonelement.h' line='291' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='binData'
> mangled-name='_ZNK5mongo11BSONElement7binDataERi'
> filepath='src/mongo/bson/bsonelement.h' line='446' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <parameter type-id='type-id-400'/>
> -            <return type-id='type-id-66'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-339'/>
> +            <return type-id='type-id-64'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='valuestrsize'
> mangled-name='_ZNK5mongo11BSONElement12valuestrsizeEv'
> filepath='src/mongo/bson/bsonelement.h' line='368' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-13'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_numberDouble'
> mangled-name='_ZNK5mongo11BSONElement13_numberDoubleEv'
> filepath='src/mongo/bson/bsonelement.h' line='304' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-11'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_numberInt'
> mangled-name='_ZNK5mongo11BSONElement10_numberIntEv'
> filepath='src/mongo/bson/bsonelement.h' line='309' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-13'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_numberLong'
> mangled-name='_ZNK5mongo11BSONElement11_numberLongEv'
> filepath='src/mongo/bson/bsonelement.h' line='321' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-16'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='_numberDecimal'
> mangled-name='_ZNK5mongo11BSONElement14_numberDecimalEv'
> filepath='src/mongo/bson/bsonelement.h' line='314' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-24'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='numberLong'
> mangled-name='_ZNK5mongo11BSONElement10numberLongEv'
> filepath='src/mongo/bson/bsonelement.h' line='330' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo11BSONElement10numberLongEv'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
>              <return type-id='type-id-16'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='chk'
> mangled-name='_ZNK5mongo11BSONElement3chkENS_8BSONTypeE'
> filepath='src/mongo/bson/bsonelement.h' line='692' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZNK5mongo11BSONElement3chkENS_8BSONTypeE'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <parameter type-id='type-id-408'/>
> -            <return type-id='type-id-188'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <parameter type-id='type-id-347'/>
> +            <return type-id='type-id-61'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-408'>
> +      <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-347'>
>          <underlying-type type-id='type-id-18'/>
>        </enum-decl>
>        <class-decl name='__anonymous_struct__14' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'/>
> @@ -8408,34 +8347,34 @@
>        <class-decl name='__anonymous_struct__19' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='private' static='yes'>
>            <function-decl name='appendNumImpl&lt;int&gt;'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIiEEvT_'
> filepath='src/mongo/bson/util/builder.h' line='334' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEi'
> filepath='src/mongo/bson/util/builder.h' line='219' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-13'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='buf'
> mangled-name='_ZNK5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3bufEv'
> filepath='src/mongo/bson/util/builder.h' line='196' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-66'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-64'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='appendNumImpl&lt;long long&gt;'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIxEEvT_'
> filepath='src/mongo/bson/util/builder.h' line='334' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-16'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendNum'
> mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEx'
> filepath='src/mongo/bson/util/builder.h' line='234' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-16'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
> @@ -8446,96 +8385,96 @@
>        <class-decl name='__anonymous_struct__22' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataENS_9TimestampE'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='437' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendNumber'
> mangled-name='_ZN5mongo14BSONObjBuilder12appendNumberENS_10StringDataEi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='336' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-13'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendObject'
> mangled-name='_ZN5mongo14BSONObjBuilder12appendObjectENS_10StringDataEPKci'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='208' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder12appendObjectENS_10StringDataEPKci'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <parameter type-id='type-id-66'/>
> +            <parameter type-id='type-id-64'/>
>              <parameter type-id='type-id-13'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='appendBinData'
> mangled-name='_ZN5mongo14BSONObjBuilder13appendBinDataENS_10StringDataEiNS_11BinDataTypeEPKv'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='563' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder13appendBinDataENS_10StringDataEiNS_11BinDataTypeEPKv'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-13'/>
> -            <parameter type-id='type-id-409'/>
> -            <parameter type-id='type-id-135'/>
> -            <return type-id='type-id-116'/>
> +            <parameter type-id='type-id-348'/>
> +            <parameter type-id='type-id-118'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEx'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='299' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEx'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-16'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEb'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='269' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEb'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-1'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='subarrayStart'
> mangled-name='_ZN5mongo14BSONObjBuilder13subarrayStartENS_10StringDataE'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='254' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder13subarrayStartENS_10StringDataE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
> -            <return type-id='type-id-195'/>
> +            <return type-id='type-id-174'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendERKNS_11BSONElementE'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='182' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendERKNS_11BSONElementE'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> -            <return type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='append'
> mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi'
> filepath='src/mongo/bson/bsonobjbuilder.h' line='277' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-24'/>
>              <parameter type-id='type-id-13'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> -      <enum-decl name='__anonymous_enum__1' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-409'>
> +      <enum-decl name='__anonymous_enum__1' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-348'>
>          <underlying-type type-id='type-id-18'/>
>        </enum-decl>
>        <class-decl name='__anonymous_struct__23' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='write&lt;mongo::LittleEndian&lt;long
> long&gt; &gt;'
> mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIxEEEERS0_RKT_m'
> filepath='src/mongo/base/data_view.h' line='82' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-188'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-61'/>
>              <parameter type-id='type-id-47'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__24' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='StatusWith'
> mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEEC2ES2_'
> filepath='src/mongo/base/status_with.h' line='92' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-333'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-274'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -8543,36 +8482,36 @@
>        <class-decl name='__anonymous_struct__25' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEx'
> filepath='src/mongo/bson/util/builder.h' line='412' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-16'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator&lt;&lt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_8BSONTypeE'
> filepath='src/mongo/bson/util/builder.h' line='443' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> -            <parameter type-id='type-id-408'/>
> -            <return type-id='type-id-116'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-347'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='str'
> mangled-name='_ZNK5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE3strB5cxx11Ev'
> filepath='src/mongo/bson/util/builder.h' line='477' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-189'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-168'/>
>            </function-decl>
>          </member-function>
>          <member-function access='private' static='yes'>
>            <function-decl name='appendIntegral&lt;long long&gt;'
> mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIxEERS2_T_i'
> filepath='src/mongo/bson/util/builder.h' line='498' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIxEERS2_T_i'>
> -            <parameter type-id='type-id-113' is-artificial='yes'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
>              <parameter type-id='type-id-16'/>
>              <parameter type-id='type-id-13'/>
> -            <return type-id='type-id-116'/>
> +            <return type-id='type-id-53'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
>        <class-decl name='__anonymous_struct__26' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-type access='private'>
> -          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-410'>
> +          <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> is-declaration-only='yes' id='type-id-349'>
>              <underlying-type type-id='type-id-18'/>
>            </enum-decl>
>          </member-type>
> @@ -8582,7 +8521,7 @@
>      <namespace-decl name='__gnu_cxx'>
>        <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-type access='public'>
> -          <typedef-decl name='const_reference' type-id='type-id-395'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='110' column='1' id='type-id-407'/>
> +          <typedef-decl name='const_reference' type-id='type-id-334'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h'
> line='110' column='1' id='type-id-346'/>
>          </member-type>
>          <member-type access='public'>
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'/>
> @@ -8593,25 +8532,25 @@
>        <class-decl name='__anonymous_struct__3' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;unsigned long, bool&gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJbEEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-234'/>
> -            <parameter type-id='type-id-300'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-257'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;unsigned long, long long&gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJxEEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-234'/>
> -            <parameter type-id='type-id-401'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-340'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
>            <function-decl name='construct&lt;unsigned long, unsigned
> int&gt;'
> mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJjEEEvPT_DpOT0_'
> filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h'
> line='119' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> -            <parameter type-id='type-id-54' is-artificial='yes'/>
> -            <parameter type-id='type-id-234'/>
> -            <parameter type-id='type-id-405'/>
> +            <parameter type-id='type-id-55' is-artificial='yes'/>
> +            <parameter type-id='type-id-204'/>
> +            <parameter type-id='type-id-344'/>
>              <return type-id='type-id-22'/>
>            </function-decl>
>          </member-function>
> @@ -8622,23 +8561,23 @@
>          <class-decl name='__anonymous_struct__' is-anonymous='yes'
> visibility='default' is-declaration-only='yes' id='type-id-24'>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [8]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA8_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-397'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-336'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;long long&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIxEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-399'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-338'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>            <member-function access='public'>
>              <function-decl name='operator&lt;&lt;&lt;char [7]&gt;'
> mangled-name='_ZN10mongoutils3str6streamlsIA7_cEERS1_RKT_'
> filepath='src/mongo/util/mongoutils/str.h' line='61' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -              <parameter type-id='type-id-118' is-artificial='yes'/>
> -              <parameter type-id='type-id-396'/>
> -              <return type-id='type-id-117'/>
> +              <parameter type-id='type-id-55' is-artificial='yes'/>
> +              <parameter type-id='type-id-335'/>
> +              <return type-id='type-id-53'/>
>              </function-decl>
>            </member-function>
>          </class-decl>
> @@ -8653,11 +8592,11 @@
>            <class-decl name='__anonymous_struct__' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>              <member-function access='public' static='yes'>
>                <function-decl name='store'
> mangled-name='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE5storeERKS2_PcmPml'
> filepath='src/mongo/db/ftdc/varint.h' line='81' column='1'
> visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE5storeERKS2_PcmPml'>
> -                <parameter type-id='type-id-188'/>
> -                <parameter type-id='type-id-59'/>
> +                <parameter type-id='type-id-61'/>
> +                <parameter type-id='type-id-56'/>
>                  <parameter type-id='type-id-26'/>
> -                <parameter type-id='type-id-204'/>
> -                <parameter type-id='type-id-157'/>
> +                <parameter type-id='type-id-183'/>
> +                <parameter type-id='type-id-139'/>
>                  <return type-id='type-id-24'/>
>                </function-decl>
>              </member-function>
> @@ -8667,8 +8606,8 @@
>        <class-decl name='__anonymous_struct__2' is-struct='yes'
> is-anonymous='yes' visibility='default' is-declaration-only='yes'
> id='type-id-24'>
>          <member-function access='public' static='yes'>
>            <function-decl name='operator unsigned long'
> mangled-name='_ZNK5mongo10FTDCVarIntcvmEv'
> filepath='src/mongo/db/ftdc/varint.h' line='55' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> -            <parameter type-id='type-id-80' is-artificial='yes'/>
> -            <return type-id='type-id-219'/>
> +            <parameter type-id='type-id-62' is-artificial='yes'/>
> +            <return type-id='type-id-194'/>
>            </function-decl>
>          </member-function>
>        </class-decl>
> diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
> b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
> index 5349383..c6f4071 100644
> --- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
> +++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
> @@ -768,30 +768,23 @@
>        </data-member>
>      </class-decl>
>      <union-decl name='__anonymous_union__1' size-in-bits='32'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='23' column='1' id='type-id-270'>
> -      <member-type access='private'>
> -        <class-decl name='__anonymous_struct__' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='36' column='1' id='type-id-271'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='locked_pending' type-id='type-id-272'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='37' column='1'/>
> -          </data-member>
> -          <data-member access='public' layout-offset-in-bits='16'>
> -            <var-decl name='tail' type-id='type-id-272'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='38' column='1'/>
> -          </data-member>
> -        </class-decl>
> -      </member-type>
>        <data-member access='private'>
> -        <var-decl name='val' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='24' column='1'/>
> +        <var-decl name='val' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='24' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-274' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='32' column='1'/>
> +        <var-decl name='' type-id='type-id-272' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='32' column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='36' column='1'/>
>        </data-member>
>      </union-decl>
> -    <typedef-decl name='atomic_t' type-id='type-id-275'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='173' column='1' id='type-id-273'/>
> -    <class-decl name='__anonymous_struct__' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='171' column='1' id='type-id-275'>
> +    <typedef-decl name='atomic_t' type-id='type-id-274'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='173' column='1' id='type-id-271'/>
> +    <class-decl name='__anonymous_struct__' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='171' column='1' id='type-id-274'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='counter' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='172' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__1' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='32' column='1' id='type-id-274'>
> +    <class-decl name='__anonymous_struct__1' size-in-bits='16'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='32' column='1' id='type-id-272'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='locked' type-id='type-id-203'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='33' column='1'/>
>        </data-member>
> @@ -801,7 +794,15 @@
>      </class-decl>
>      <typedef-decl name='u8' type-id='type-id-9'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/int-ll64.h'
> line='17' column='1' id='type-id-203'/>
>      <typedef-decl name='__u8' type-id='type-id-208'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/int-ll64.h'
> line='21' column='1' id='type-id-9'/>
> -    <typedef-decl name='u16' type-id='type-id-276'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/int-ll64.h'
> line='19' column='1' id='type-id-272'/>
> +    <class-decl name='__anonymous_struct__2' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='36' column='1' id='type-id-273'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='locked_pending' type-id='type-id-275'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='37' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='16'>
> +        <var-decl name='tail' type-id='type-id-275' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h'
> line='38' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <typedef-decl name='u16' type-id='type-id-276'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/int-ll64.h'
> line='19' column='1' id='type-id-275'/>
>      <typedef-decl name='__u16' type-id='type-id-219'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/int-ll64.h'
> line='24' column='1' id='type-id-276'/>
>      <class-decl name='list_head' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='181' column='1' id='type-id-158'>
>        <data-member access='public' layout-offset-in-bits='0'>
> @@ -990,7 +991,7 @@
>          <var-decl name='sdio_irq_pending' type-id='type-id-235'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mmc/host.h'
> line='427' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='10080'>
> -        <var-decl name='sdio_irq_thread_abort' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mmc/host.h'
> line='428' column='1'/>
> +        <var-decl name='sdio_irq_thread_abort' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mmc/host.h'
> line='428' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='10112'>
>          <var-decl name='pm_flags' type-id='type-id-284'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mmc/host.h'
> line='430' column='1'/>
> @@ -1506,7 +1507,7 @@
>          <var-decl name='hash_len' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h'
> line='52' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__2' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h'
> line='49' column='1' id='type-id-391'>
> +    <class-decl name='__anonymous_struct__3' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h'
> line='49' column='1' id='type-id-391'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='hash' type-id='type-id-197' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h'
> line='50' column='1'/>
>        </data-member>
> @@ -1609,10 +1610,10 @@
>          <var-decl name='i_wb_frn_winner' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='682' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2080'>
> -        <var-decl name='i_wb_frn_avg_time' type-id='type-id-272'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='683' column='1'/>
> +        <var-decl name='i_wb_frn_avg_time' type-id='type-id-275'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='683' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2096'>
> -        <var-decl name='i_wb_frn_history' type-id='type-id-272'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='684' column='1'/>
> +        <var-decl name='i_wb_frn_history' type-id='type-id-275'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='684' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2112'>
>          <var-decl name='i_lru' type-id='type-id-158' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='686' column='1'/>
> @@ -1630,16 +1631,16 @@
>          <var-decl name='i_version' type-id='type-id-402'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='693' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2688'>
> -        <var-decl name='i_count' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='694' column='1'/>
> +        <var-decl name='i_count' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='694' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2720'>
> -        <var-decl name='i_dio_count' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='695' column='1'/>
> +        <var-decl name='i_dio_count' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='695' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2752'>
> -        <var-decl name='i_writecount' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='696' column='1'/>
> +        <var-decl name='i_writecount' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='696' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2784'>
> -        <var-decl name='i_readcount' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='698' column='1'/>
> +        <var-decl name='i_readcount' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='698' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2816'>
>          <var-decl name='' type-id='type-id-403' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='700' column='1'/>
> @@ -1673,7 +1674,7 @@
>        </data-member>
>      </class-decl>
>      <typedef-decl name='kuid_t' type-id='type-id-409'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h'
> line='23' column='1' id='type-id-393'/>
> -    <class-decl name='__anonymous_struct__3' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-393'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h'
> line='21' column='1' id='type-id-409'>
> +    <class-decl name='__anonymous_struct__4' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-393'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h'
> line='21' column='1' id='type-id-409'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='val' type-id='type-id-410' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h'
> line='22' column='1'/>
>        </data-member>
> @@ -1681,7 +1682,7 @@
>      <typedef-decl name='uid_t' type-id='type-id-411'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='32' column='1' id='type-id-410'/>
>      <typedef-decl name='__kernel_uid32_t' type-id='type-id-210'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='49' column='1' id='type-id-411'/>
>      <typedef-decl name='kgid_t' type-id='type-id-412'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h'
> line='28' column='1' id='type-id-155'/>
> -    <class-decl name='__anonymous_struct__4' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-155'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h'
> line='26' column='1' id='type-id-412'>
> +    <class-decl name='__anonymous_struct__5' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-155'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h'
> line='26' column='1' id='type-id-412'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='val' type-id='type-id-413' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uidgid.h'
> line='27' column='1'/>
>        </data-member>
> @@ -1948,7 +1949,7 @@
>          <var-decl name='s_count' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1422' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1248'>
> -        <var-decl name='s_active' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1423' column='1'/>
> +        <var-decl name='s_active' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1423' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1280'>
>          <var-decl name='s_security' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1425' column='1'/>
> @@ -2294,7 +2295,7 @@
>          <var-decl name='exit' type-id='type-id-498' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/module.h'
> line='496' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='6656'>
> -        <var-decl name='refcnt' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/module.h'
> line='498' column='1'/>
> +        <var-decl name='refcnt' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/module.h'
> line='498' column='1'/>
>        </data-member>
>      </class-decl>
>      <enum-decl name='module_state'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/module.h'
> line='296' column='1' id='type-id-476'>
> @@ -2367,7 +2368,7 @@
>      </class-decl>
>      <typedef-decl name='atomic_long_t' type-id='type-id-402'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/atomic-long.h'
> line='12' column='1' id='type-id-17'/>
>      <typedef-decl name='atomic64_t' type-id='type-id-510'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='178' column='1' id='type-id-402'/>
> -    <class-decl name='__anonymous_struct__5' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-402'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='176' column='1' id='type-id-510'>
> +    <class-decl name='__anonymous_struct__6' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-402'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='176' column='1' id='type-id-510'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='counter' type-id='type-id-511'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='177' column='1'/>
>        </data-member>
> @@ -2375,7 +2376,7 @@
>      <typedef-decl name='s64' type-id='type-id-444'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/int-ll64.h'
> line='22' column='1' id='type-id-511'/>
>      <class-decl name='optimistic_spin_queue' size-in-bits='32'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/osq_lock.h'
> line='15' column='1' id='type-id-509'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tail' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/osq_lock.h'
> line='20' column='1'/>
> +        <var-decl name='tail' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/osq_lock.h'
> line='20' column='1'/>
>        </data-member>
>      </class-decl>
>      <class-decl name='kernel_param' size-in-bits='320' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h'
> line='69' column='1' id='type-id-512'>
> @@ -2637,7 +2638,7 @@
>          <var-decl name='srcu_barrier_completion' type-id='type-id-262'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/srcutree.h'
> line='79' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4032'>
> -        <var-decl name='srcu_barrier_cpu_cnt' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/srcutree.h'
> line='81' column='1'/>
> +        <var-decl name='srcu_barrier_cpu_cnt' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/srcutree.h'
> line='81' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4096'>
>          <var-decl name='work' type-id='type-id-289' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/srcutree.h'
> line='84' column='1'/>
> @@ -2808,7 +2809,7 @@
>      </class-decl>
>      <class-decl name='static_key' size-in-bits='32' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/jump_label.h'
> line='110' column='1' id='type-id-557'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='enabled' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/jump_label.h'
> line='111' column='1'/>
> +        <var-decl name='enabled' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/jump_label.h'
> line='111' column='1'/>
>        </data-member>
>      </class-decl>
>      <class-decl name='tracepoint_func' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/tracepoint-defs.h'
> line='24' column='1' id='type-id-559'>
> @@ -2940,7 +2941,7 @@
>          <var-decl name='dq_dqb_lock' type-id='type-id-234'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/quota.h'
> line='300' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='800'>
> -        <var-decl name='dq_count' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/quota.h'
> line='301' column='1'/>
> +        <var-decl name='dq_count' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/quota.h'
> line='301' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
>          <var-decl name='dq_sb' type-id='type-id-383' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/quota.h'
> line='302' column='1'/>
> @@ -2978,7 +2979,7 @@
>        </data-member>
>      </union-decl>
>      <typedef-decl name='kprojid_t' type-id='type-id-586'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/projid.h'
> line='24' column='1' id='type-id-585'/>
> -    <class-decl name='__anonymous_struct__6' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-585'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/projid.h'
> line='22' column='1' id='type-id-586'>
> +    <class-decl name='__anonymous_struct__7' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-585'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/projid.h'
> line='22' column='1' id='type-id-586'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='val' type-id='type-id-587' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/projid.h'
> line='23' column='1'/>
>        </data-member>
> @@ -3031,102 +3032,39 @@
>          <var-decl name='' type-id='type-id-591' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='178' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='416'>
> -        <var-decl name='_refcount' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='198' column='1'/>
> +        <var-decl name='_refcount' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='198' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <var-decl name='mem_cgroup' type-id='type-id-592'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='201' 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-590'>
> -      <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-594'>
> -          <data-member access='public' layout-offset-in-bits='0'>
> -            <var-decl name='' type-id='type-id-595' 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-597' 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-605' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='79' column='1'/>
> +        <var-decl name='' type-id='type-id-593' 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='' type-id='type-id-594' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='97' column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-595' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='104' column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-596' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='131' column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-597' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='139' column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-598' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='144' column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-599' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='158' 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__7' 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-605'>
> +    <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/mm_types.h'
> line='79' column='1' id='type-id-593'>
>        <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>
> @@ -3145,16 +3083,16 @@
>          <var-decl name='host' type-id='type-id-148' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='443' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='i_pages' type-id='type-id-606'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='444' column='1'/>
> +        <var-decl name='i_pages' type-id='type-id-600'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='444' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='gfp_mask' type-id='type-id-607'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='445' column='1'/>
> +        <var-decl name='gfp_mask' type-id='type-id-601'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='445' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='224'>
> -        <var-decl name='i_mmap_writable' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='446' column='1'/>
> +        <var-decl name='i_mmap_writable' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='446' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='i_mmap' type-id='type-id-608'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='447' column='1'/>
> +        <var-decl name='i_mmap' type-id='type-id-602'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='447' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <var-decl name='i_mmap_rwsem' type-id='type-id-399'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='448' column='1'/>
> @@ -3169,7 +3107,7 @@
>          <var-decl name='writeback_index' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='451' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='a_ops' type-id='type-id-609' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='452' column='1'/>
> +        <var-decl name='a_ops' type-id='type-id-603' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='452' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
>          <var-decl name='flags' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='453' column='1'/>
> @@ -3187,27 +3125,27 @@
>          <var-decl name='private_data' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='457' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='xarray' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/xarray.h'
> line='292' column='1' id='type-id-606'>
> +    <class-decl name='xarray' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/xarray.h'
> line='292' column='1' id='type-id-600'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='xa_lock' type-id='type-id-234'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/xarray.h'
> line='293' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='xa_flags' type-id='type-id-607'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/xarray.h'
> line='295' column='1'/>
> +        <var-decl name='xa_flags' type-id='type-id-601'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/xarray.h'
> line='295' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='xa_head' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/xarray.h'
> line='296' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='gfp_t' type-id='type-id-210'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='153' column='1' id='type-id-607'/>
> -    <class-decl name='rb_root_cached' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rbtree.h'
> line='125' column='1' id='type-id-608'>
> +    <typedef-decl name='gfp_t' type-id='type-id-210'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='153' column='1' id='type-id-601'/>
> +    <class-decl name='rb_root_cached' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rbtree.h'
> line='125' column='1' id='type-id-602'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='rb_root' type-id='type-id-610'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rbtree.h'
> line='126' column='1'/>
> +        <var-decl name='rb_root' type-id='type-id-604'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rbtree.h'
> line='126' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='rb_leftmost' type-id='type-id-529'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rbtree.h'
> line='127' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='rb_root' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rbtree.h'
> line='31' column='1' id='type-id-610'>
> +    <class-decl name='rb_root' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rbtree.h'
> line='31' column='1' id='type-id-604'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='rb_node' type-id='type-id-529'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rbtree.h'
> line='32' column='1'/>
>        </data-member>
> @@ -3223,80 +3161,80 @@
>          <var-decl name='osq' type-id='type-id-509' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwsem.h'
> line='44' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='160'>
> -        <var-decl name='wait_lock' type-id='type-id-611'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwsem.h'
> line='46' column='1'/>
> +        <var-decl name='wait_lock' type-id='type-id-605'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwsem.h'
> line='46' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <var-decl name='wait_list' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwsem.h'
> line='47' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='raw_spinlock_t' type-id='type-id-267'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/spinlock_types.h'
> line='29' column='1' id='type-id-611'/>
> -    <class-decl name='address_space_operations' size-in-bits='1344'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='360' column='1' id='type-id-612'>
> +    <typedef-decl name='raw_spinlock_t' type-id='type-id-267'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/spinlock_types.h'
> line='29' column='1' id='type-id-605'/>
> +    <class-decl name='address_space_operations' size-in-bits='1344'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='360' column='1' id='type-id-606'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='writepage' type-id='type-id-613'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='361' column='1'/>
> +        <var-decl name='writepage' type-id='type-id-607'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='361' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='readpage' type-id='type-id-614'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='362' column='1'/>
> +        <var-decl name='readpage' type-id='type-id-608'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='362' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='writepages' type-id='type-id-615'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='365' column='1'/>
> +        <var-decl name='writepages' type-id='type-id-609'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='365' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='set_page_dirty' type-id='type-id-616'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='368' column='1'/>
> +        <var-decl name='set_page_dirty' type-id='type-id-610'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='368' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='readpages' type-id='type-id-617'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='374' column='1'/>
> +        <var-decl name='readpages' type-id='type-id-611'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='374' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='write_begin' type-id='type-id-618'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='377' column='1'/>
> +        <var-decl name='write_begin' type-id='type-id-612'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='377' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='write_end' type-id='type-id-619'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='380' column='1'/>
> +        <var-decl name='write_end' type-id='type-id-613'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='380' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='bmap' type-id='type-id-620' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='385' column='1'/>
> +        <var-decl name='bmap' type-id='type-id-614' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='385' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='invalidatepage' type-id='type-id-621'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='386' column='1'/>
> +        <var-decl name='invalidatepage' type-id='type-id-615'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='386' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='releasepage' type-id='type-id-622'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='387' column='1'/>
> +        <var-decl name='releasepage' type-id='type-id-616'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='387' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='freepage' type-id='type-id-623'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='388' column='1'/>
> +        <var-decl name='freepage' type-id='type-id-617'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='388' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='direct_IO' type-id='type-id-624'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='389' column='1'/>
> +        <var-decl name='direct_IO' type-id='type-id-618'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='389' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='migratepage' type-id='type-id-625'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='394' column='1'/>
> +        <var-decl name='migratepage' type-id='type-id-619'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='394' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
> -        <var-decl name='isolate_page' type-id='type-id-626'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='396' column='1'/>
> +        <var-decl name='isolate_page' type-id='type-id-620'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='396' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='putback_page' type-id='type-id-623'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='397' column='1'/>
> +        <var-decl name='putback_page' type-id='type-id-617'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='397' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
> -        <var-decl name='launder_page' type-id='type-id-616'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='398' column='1'/>
> +        <var-decl name='launder_page' type-id='type-id-610'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='398' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
> -        <var-decl name='is_partially_uptodate' type-id='type-id-627'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='399' column='1'/>
> +        <var-decl name='is_partially_uptodate' type-id='type-id-621'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='399' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
> -        <var-decl name='is_dirty_writeback' type-id='type-id-628'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='401' column='1'/>
> +        <var-decl name='is_dirty_writeback' type-id='type-id-622'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='401' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
> -        <var-decl name='error_remove_page' type-id='type-id-629'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='402' column='1'/>
> +        <var-decl name='error_remove_page' type-id='type-id-623'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='402' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1216'>
> -        <var-decl name='swap_activate' type-id='type-id-630'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='405' column='1'/>
> +        <var-decl name='swap_activate' type-id='type-id-624'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='405' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1280'>
> -        <var-decl name='swap_deactivate' type-id='type-id-631'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='407' column='1'/>
> +        <var-decl name='swap_deactivate' type-id='type-id-625'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='407' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='sector_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='130' column='1' id='type-id-632'/>
> -    <class-decl name='kiocb' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='316' column='1' id='type-id-633'>
> +    <typedef-decl name='sector_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='130' column='1' id='type-id-626'/>
> +    <class-decl name='kiocb' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='316' column='1' id='type-id-627'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='ki_filp' type-id='type-id-441'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='317' column='1'/>
>        </data-member>
> @@ -3304,7 +3242,7 @@
>          <var-decl name='ki_pos' type-id='type-id-365'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='322' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='ki_complete' type-id='type-id-634'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='323' column='1'/>
> +        <var-decl name='ki_complete' type-id='type-id-628'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='323' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <var-decl name='private' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='324' column='1'/>
> @@ -3313,35 +3251,54 @@
>          <var-decl name='ki_flags' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='325' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='288'>
> -        <var-decl name='ki_hint' type-id='type-id-272'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='326' column='1'/>
> +        <var-decl name='ki_hint' type-id='type-id-275'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='326' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='304'>
> -        <var-decl name='ki_ioprio' type-id='type-id-272'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='327' column='1'/>
> +        <var-decl name='ki_ioprio' type-id='type-id-275'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='327' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <var-decl name='ki_cookie' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='328' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='migrate_mode'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/migrate_mode.h'
> line='15' column='1' id='type-id-635'>
> +    <enum-decl name='migrate_mode'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/migrate_mode.h'
> line='15' column='1' id='type-id-629'>
>        <underlying-type type-id='type-id-207'/>
>        <enumerator name='MIGRATE_ASYNC' value='0'/>
>        <enumerator name='MIGRATE_SYNC_LIGHT' value='1'/>
>        <enumerator name='MIGRATE_SYNC' value='2'/>
>        <enumerator name='MIGRATE_SYNC_NO_COPY' value='3'/>
>      </enum-decl>
> -    <typedef-decl name='isolate_mode_t' type-id='type-id-210'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mmzone.h'
> line='317' column='1' id='type-id-636'/>
> +    <typedef-decl name='isolate_mode_t' type-id='type-id-210'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mmzone.h'
> line='317' column='1' id='type-id-630'/>
>      <typedef-decl name='errseq_t' type-id='type-id-197'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/errseq.h'
> line='8' column='1' id='type-id-370'/>
> -    <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-595'>
> +    <class-decl name='__anonymous_struct__9' 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-594'>
> +      <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>
> +    <class-decl name='__anonymous_struct__10' 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-595'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='' type-id='type-id-631' 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-632'
> 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-633' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='121' 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-631'>
>        <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-637' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='107' column='1'/>
> +        <var-decl name='' type-id='type-id-634' 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__8' 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-637'>
> +    <class-decl name='__anonymous_struct__11' 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-634'>
>        <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'/>
> +        <var-decl name='next' type-id='type-id-635' 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'/>
> @@ -3350,7 +3307,7 @@
>          <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-597'>
> +    <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-633'>
>        <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>
> @@ -3358,10 +3315,10 @@
>          <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-639' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='124' column='1'/>
> +        <var-decl name='' type-id='type-id-636' 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__9' 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-639'>
> +    <class-decl name='__anonymous_struct__12' 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-636'>
>        <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>
> @@ -3372,35 +3329,77 @@
>          <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>
> -    <typedef-decl name='pgtable_t' type-id='type-id-638'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/page.h'
> line='27' column='1' id='type-id-601'/>
> -    <union-decl name='__anonymous_union__9' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='148' column='1' id='type-id-602'>
> +    <class-decl name='__anonymous_struct__13' 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-596'>
> +      <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-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='137' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <class-decl name='__anonymous_struct__14' 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-597'>
> +      <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>
> +    <class-decl name='__anonymous_struct__15' 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-598'>
> +      <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-637'
> 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-638' 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>
> +    <typedef-decl name='pgtable_t' type-id='type-id-635'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/page.h'
> line='27' column='1' id='type-id-637'/>
> +    <union-decl name='__anonymous_union__9' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='148' column='1' id='type-id-638'>
>        <data-member access='private'>
> -        <var-decl name='pt_mm' type-id='type-id-640' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='149' column='1'/>
> +        <var-decl name='pt_mm' type-id='type-id-639' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='149' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='pt_frag_refcount' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='150' column='1'/>
> +        <var-decl name='pt_frag_refcount' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='150' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='mm_struct' size-in-bits='6848' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='372' column='1' id='type-id-641'>
> +    <class-decl name='mm_struct' size-in-bits='6848' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='372' column='1' id='type-id-640'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='' type-id='type-id-642' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='373' column='1'/>
> +        <var-decl name='' type-id='type-id-641' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='373' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='6848'>
>          <var-decl name='cpu_bitmap' type-id='type-id-218'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='532' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__10' 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-642'>
> +    <class-decl name='__anonymous_struct__16' 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-641'>
>        <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'/>
> +        <var-decl name='mm_rb' type-id='type-id-604' 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'/>
> +        <var-decl name='get_unmapped_area' type-id='type-id-642'
> 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'/>
> @@ -3415,13 +3414,13 @@
>          <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'/>
> +        <var-decl name='pgd' type-id='type-id-643' 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'/>
> +        <var-decl name='mm_users' type-id='type-id-271'
> 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'/>
> +        <var-decl name='mm_count' type-id='type-id-271'
> 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'/>
> @@ -3505,28 +3504,28 @@
>          <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'/>
> +        <var-decl name='rss_stat' type-id='type-id-644'
> 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'/>
> +        <var-decl name='binfmt' type-id='type-id-645'
> 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'/>
> +        <var-decl name='context' type-id='type-id-646'
> 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'/>
> +        <var-decl name='core_state' type-id='type-id-647'
> 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'/>
> +        <var-decl name='membarrier_state' type-id='type-id-271'
> 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'/>
> +        <var-decl name='ioctx_table' type-id='type-id-648'
> 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'/>
> @@ -3538,16 +3537,16 @@
>          <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'/>
> +        <var-decl name='tlb_flush_pending' type-id='type-id-271'
> 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'/>
> +        <var-decl name='uprobes_state' type-id='type-id-649'
> 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>
> -    <class-decl name='vm_area_struct' size-in-bits='1472' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='287' column='1' id='type-id-651'>
> +    <class-decl name='vm_area_struct' size-in-bits='1472' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='287' column='1' id='type-id-650'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='vm_start' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='290' column='1'/>
>        </data-member>
> @@ -3567,25 +3566,25 @@
>          <var-decl name='rb_subtree_gap' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='305' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='vm_mm' type-id='type-id-640' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='309' column='1'/>
> +        <var-decl name='vm_mm' type-id='type-id-639' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='309' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='vm_page_prot' type-id='type-id-652'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='310' column='1'/>
> +        <var-decl name='vm_page_prot' type-id='type-id-651'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='310' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
>          <var-decl name='vm_flags' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='311' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='' type-id='type-id-653' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='321' column='1'/>
> +        <var-decl name='' type-id='type-id-652' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='321' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
>          <var-decl name='anon_vma_chain' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='335' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
> -        <var-decl name='anon_vma' type-id='type-id-654'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='337' column='1'/>
> +        <var-decl name='anon_vma' type-id='type-id-653'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='337' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
> -        <var-decl name='vm_ops' type-id='type-id-655'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='340' column='1'/>
> +        <var-decl name='vm_ops' type-id='type-id-654'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='340' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1216'>
>          <var-decl name='vm_pgoff' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='343' column='1'/>
> @@ -3600,25 +3599,25 @@
>          <var-decl name='swap_readahead_info' type-id='type-id-17'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='349' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1472'>
> -        <var-decl name='vm_userfaultfd_ctx' type-id='type-id-656'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='357' column='1'/>
> +        <var-decl name='vm_userfaultfd_ctx' type-id='type-id-655'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='357' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='pgprot_t' type-id='type-id-657'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='42' column='1' id='type-id-652'/>
> -    <class-decl name='__anonymous_struct__11' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-652'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='42' column='1' id='type-id-657'>
> +    <typedef-decl name='pgprot_t' type-id='type-id-656'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='42' column='1' id='type-id-651'/>
> +    <class-decl name='__anonymous_struct__17' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-651'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='42' column='1' id='type-id-656'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='pgprot' type-id='type-id-658'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='42' column='1'/>
> +        <var-decl name='pgprot' type-id='type-id-657'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='42' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='pteval_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='14' column='1' id='type-id-658'/>
> -    <union-decl name='__anonymous_union__10' 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-653'>
> +    <typedef-decl name='pteval_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='14' column='1' id='type-id-657'/>
> +    <union-decl name='__anonymous_union__10' 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-652'>
>        <data-member access='private'>
> -        <var-decl name='shared' type-id='type-id-659'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='325' column='1'/>
> +        <var-decl name='shared' type-id='type-id-658'
> 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__12' 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-659'>
> +    <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/linux/mm_types.h'
> line='322' column='1' id='type-id-658'>
>        <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>
> @@ -3626,49 +3625,49 @@
>          <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>
> -    <class-decl name='vm_operations_struct' size-in-bits='832'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='467' column='1' id='type-id-660'>
> +    <class-decl name='vm_operations_struct' size-in-bits='832'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='467' column='1' id='type-id-659'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='open' type-id='type-id-661' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='468' column='1'/>
> +        <var-decl name='open' type-id='type-id-660' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='468' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='close' type-id='type-id-661' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='469' column='1'/>
> +        <var-decl name='close' type-id='type-id-660' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='469' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='split' type-id='type-id-662' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='470' column='1'/>
> +        <var-decl name='split' type-id='type-id-661' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='470' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='mremap' type-id='type-id-663'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='471' column='1'/>
> +        <var-decl name='mremap' type-id='type-id-662'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='471' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='fault' type-id='type-id-664' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='472' column='1'/>
> +        <var-decl name='fault' type-id='type-id-663' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='472' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='huge_fault' type-id='type-id-665'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='473' column='1'/>
> +        <var-decl name='huge_fault' type-id='type-id-664'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='473' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='map_pages' type-id='type-id-666'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='475' column='1'/>
> +        <var-decl name='map_pages' type-id='type-id-665'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='475' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='pagesize' type-id='type-id-667'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='477' column='1'/>
> +        <var-decl name='pagesize' type-id='type-id-666'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='477' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='page_mkwrite' type-id='type-id-664'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='481' column='1'/>
> +        <var-decl name='page_mkwrite' type-id='type-id-663'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='481' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='pfn_mkwrite' type-id='type-id-664'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='484' column='1'/>
> +        <var-decl name='pfn_mkwrite' type-id='type-id-663'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='484' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='access' type-id='type-id-668'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='489' column='1'/>
> +        <var-decl name='access' type-id='type-id-667'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='489' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='name' type-id='type-id-669' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='495' column='1'/>
> +        <var-decl name='name' type-id='type-id-668' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='495' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='find_special_page' type-id='type-id-670'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='525' column='1'/>
> +        <var-decl name='find_special_page' type-id='type-id-669'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='525' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='vm_fault_t' type-id='type-id-210'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='649' column='1' id='type-id-671'/>
> -    <class-decl name='vm_fault' size-in-bits='832' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='417' column='1' id='type-id-672'>
> +    <typedef-decl name='vm_fault_t' type-id='type-id-210'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='649' column='1' id='type-id-670'/>
> +    <class-decl name='vm_fault' size-in-bits='832' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='417' column='1' id='type-id-671'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='vma' type-id='type-id-222' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='418' column='1'/>
>        </data-member>
> @@ -3676,7 +3675,7 @@
>          <var-decl name='flags' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='419' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='gfp_mask' type-id='type-id-607'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='420' column='1'/>
> +        <var-decl name='gfp_mask' type-id='type-id-601'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='420' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='pgoff' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='421' column='1'/>
> @@ -3685,73 +3684,73 @@
>          <var-decl name='address' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='422' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='pmd' type-id='type-id-673' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='423' column='1'/>
> +        <var-decl name='pmd' type-id='type-id-672' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='423' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='pud' type-id='type-id-674' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='425' column='1'/>
> +        <var-decl name='pud' type-id='type-id-673' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='425' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='orig_pte' type-id='type-id-675'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='428' column='1'/>
> +        <var-decl name='orig_pte' type-id='type-id-674'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='428' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='cow_page' type-id='type-id-638'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='430' column='1'/>
> +        <var-decl name='cow_page' type-id='type-id-635'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='430' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
>          <var-decl name='memcg' type-id='type-id-592' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='431' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='page' type-id='type-id-638' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='432' column='1'/>
> +        <var-decl name='page' type-id='type-id-635' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='432' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='pte' type-id='type-id-676' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='438' column='1'/>
> +        <var-decl name='pte' type-id='type-id-675' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='438' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='ptl' type-id='type-id-677' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='442' column='1'/>
> +        <var-decl name='ptl' type-id='type-id-676' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='442' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='prealloc_pte' type-id='type-id-601'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='446' column='1'/>
> +        <var-decl name='prealloc_pte' type-id='type-id-637'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='446' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='pmd_t' type-id='type-id-678'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='27' column='1' id='type-id-679'/>
> -    <class-decl name='__anonymous_struct__13' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-679'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='27' column='1' id='type-id-678'>
> +    <typedef-decl name='pmd_t' type-id='type-id-677'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='27' column='1' id='type-id-678'/>
> +    <class-decl name='__anonymous_struct__19' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-678'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='27' column='1' id='type-id-677'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='pmd' type-id='type-id-680' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='27' column='1'/>
> +        <var-decl name='pmd' type-id='type-id-679' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='27' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='pmdval_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='15' column='1' id='type-id-680'/>
> -    <typedef-decl name='pud_t' type-id='type-id-681'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/pgtable-nop4d-hack.h'
> line='15' column='1' id='type-id-682'/>
> -    <class-decl name='__anonymous_struct__14' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-682'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/pgtable-nop4d-hack.h'
> line='15' column='1' id='type-id-681'>
> +    <typedef-decl name='pmdval_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='15' column='1' id='type-id-679'/>
> +    <typedef-decl name='pud_t' type-id='type-id-680'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/pgtable-nop4d-hack.h'
> line='15' column='1' id='type-id-681'/>
> +    <class-decl name='__anonymous_struct__20' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-681'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/pgtable-nop4d-hack.h'
> line='15' column='1' id='type-id-680'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='pgd' type-id='type-id-683' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/pgtable-nop4d-hack.h'
> line='15' column='1'/>
> +        <var-decl name='pgd' type-id='type-id-682' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/pgtable-nop4d-hack.h'
> line='15' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='pgd_t' type-id='type-id-684'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='38' column='1' id='type-id-683'/>
> -    <class-decl name='__anonymous_struct__15' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-683'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='38' column='1' id='type-id-684'>
> +    <typedef-decl name='pgd_t' type-id='type-id-683'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='38' column='1' id='type-id-682'/>
> +    <class-decl name='__anonymous_struct__21' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-682'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='38' column='1' id='type-id-683'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='pgd' type-id='type-id-685' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='38' column='1'/>
> +        <var-decl name='pgd' type-id='type-id-684' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='38' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='pgdval_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='17' column='1' id='type-id-685'/>
> -    <typedef-decl name='pte_t' type-id='type-id-686'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='22' column='1' id='type-id-675'/>
> -    <class-decl name='__anonymous_struct__16' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-675'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='22' column='1' id='type-id-686'>
> +    <typedef-decl name='pgdval_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='17' column='1' id='type-id-684'/>
> +    <typedef-decl name='pte_t' type-id='type-id-685'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='22' column='1' id='type-id-674'/>
> +    <class-decl name='__anonymous_struct__22' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-674'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='22' column='1' id='type-id-685'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='pte' type-id='type-id-658' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='22' column='1'/>
> +        <var-decl name='pte' type-id='type-id-657' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h'
> line='22' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='page_entry_size'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='456' column='1' id='type-id-687'>
> +    <enum-decl name='page_entry_size'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm.h'
> line='456' column='1' id='type-id-686'>
>        <underlying-type type-id='type-id-207'/>
>        <enumerator name='PE_SIZE_PTE' value='0'/>
>        <enumerator name='PE_SIZE_PMD' value='1'/>
>        <enumerator name='PE_SIZE_PUD' value='2'/>
>      </enum-decl>
> -    <class-decl name='vm_userfaultfd_ctx' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='278' column='1' id='type-id-656'/>
> -    <class-decl name='mm_rss_stat' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='56' column='1' id='type-id-645'>
> +    <class-decl name='vm_userfaultfd_ctx' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='278' column='1' id='type-id-655'/>
> +    <class-decl name='mm_rss_stat' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='56' column='1' id='type-id-644'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='count' type-id='type-id-18' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='57' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='mm_context_t' type-id='type-id-688'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/mmu.h'
> line='23' column='1' id='type-id-647'/>
> -    <class-decl name='__anonymous_struct__17' size-in-bits='192'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-647'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/mmu.h'
> line='19' column='1' id='type-id-688'>
> +    <typedef-decl name='mm_context_t' type-id='type-id-687'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/mmu.h'
> line='23' column='1' id='type-id-646'/>
> +    <class-decl name='__anonymous_struct__23' size-in-bits='192'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-646'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/mmu.h'
> line='19' column='1' id='type-id-687'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='id' type-id='type-id-402' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/mmu.h'
> line='20' column='1'/>
>        </data-member>
> @@ -3762,37 +3761,37 @@
>          <var-decl name='flags' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/mmu.h'
> line='22' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='core_state' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='365' column='1' id='type-id-689'>
> +    <class-decl name='core_state' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='365' column='1' id='type-id-688'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='nr_threads' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='366' column='1'/>
> +        <var-decl name='nr_threads' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='366' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='dumper' type-id='type-id-690'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='367' column='1'/>
> +        <var-decl name='dumper' type-id='type-id-689'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='367' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <var-decl name='startup' type-id='type-id-262'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='368' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='core_thread' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='360' column='1' id='type-id-690'>
> +    <class-decl name='core_thread' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='360' column='1' id='type-id-689'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='task' type-id='type-id-292' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='361' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='next' type-id='type-id-691' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='362' column='1'/>
> +        <var-decl name='next' type-id='type-id-690' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h'
> line='362' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='task_struct' size-in-bits='28672' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='637' column='1' id='type-id-692'>
> +    <class-decl name='task_struct' size-in-bits='28672' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='637' column='1' id='type-id-691'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='thread_info' type-id='type-id-693'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='643' column='1'/>
> +        <var-decl name='thread_info' type-id='type-id-692'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='643' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='state' type-id='type-id-694' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='646' column='1'/>
> +        <var-decl name='state' type-id='type-id-693' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='646' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <var-decl name='stack' type-id='type-id-225' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='654' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='usage' type-id='type-id-695' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='655' column='1'/>
> +        <var-decl name='usage' type-id='type-id-694' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='655' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='352'>
>          <var-decl name='flags' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='657' column='1'/>
> @@ -3840,19 +3839,19 @@
>          <var-decl name='rt_priority' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='686' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
> -        <var-decl name='sched_class' type-id='type-id-696'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='688' column='1'/>
> +        <var-decl name='sched_class' type-id='type-id-695'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='688' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1536'>
> -        <var-decl name='se' type-id='type-id-697' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='689' column='1'/>
> +        <var-decl name='se' type-id='type-id-696' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='689' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5120'>
> -        <var-decl name='rt' type-id='type-id-698' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='690' column='1'/>
> +        <var-decl name='rt' type-id='type-id-697' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='690' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5696'>
> -        <var-decl name='sched_task_group' type-id='type-id-699'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='692' column='1'/>
> +        <var-decl name='sched_task_group' type-id='type-id-698'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='692' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5760'>
> -        <var-decl name='dl' type-id='type-id-700' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='694' column='1'/>
> +        <var-decl name='dl' type-id='type-id-699' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='694' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7488'>
>          <var-decl name='policy' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='712' column='1'/>
> @@ -3861,22 +3860,22 @@
>          <var-decl name='nr_cpus_allowed' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='713' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7552'>
> -        <var-decl name='cpus_ptr' type-id='type-id-701'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='714' column='1'/>
> +        <var-decl name='cpus_ptr' type-id='type-id-700'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='714' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7616'>
> -        <var-decl name='cpus_mask' type-id='type-id-702'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='715' column='1'/>
> +        <var-decl name='cpus_mask' type-id='type-id-701'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='715' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7680'>
>          <var-decl name='rcu_read_lock_nesting' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='718' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7712'>
> -        <var-decl name='rcu_read_unlock_special' type-id='type-id-703'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='719' column='1'/>
> +        <var-decl name='rcu_read_unlock_special' type-id='type-id-702'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='719' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7744'>
>          <var-decl name='rcu_node_entry' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='720' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7872'>
> -        <var-decl name='rcu_blocked_node' type-id='type-id-704'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='721' column='1'/>
> +        <var-decl name='rcu_blocked_node' type-id='type-id-703'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='721' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7936'>
>          <var-decl name='rcu_tasks_nvcsw' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='725' column='1'/>
> @@ -3894,28 +3893,28 @@
>          <var-decl name='rcu_tasks_holdout_list' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='729' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8192'>
> -        <var-decl name='sched_info' type-id='type-id-705'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='732' column='1'/>
> +        <var-decl name='sched_info' type-id='type-id-704'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='732' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8448'>
>          <var-decl name='tasks' type-id='type-id-158' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='734' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8576'>
> -        <var-decl name='pushable_tasks' type-id='type-id-706'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='736' column='1'/>
> +        <var-decl name='pushable_tasks' type-id='type-id-705'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='736' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='8896'>
>          <var-decl name='pushable_dl_tasks' type-id='type-id-184'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='737' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='9088'>
> -        <var-decl name='mm' type-id='type-id-640' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='740' column='1'/>
> +        <var-decl name='mm' type-id='type-id-639' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='740' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='9152'>
> -        <var-decl name='active_mm' type-id='type-id-640'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='741' column='1'/>
> +        <var-decl name='active_mm' type-id='type-id-639'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='741' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='9216'>
> -        <var-decl name='vmacache' type-id='type-id-707'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='744' column='1'/>
> +        <var-decl name='vmacache' type-id='type-id-706'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='744' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='9536'>
> -        <var-decl name='rss_stat' type-id='type-id-708'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='747' column='1'/>
> +        <var-decl name='rss_stat' type-id='type-id-707'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='747' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='9696'>
>          <var-decl name='exit_state' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='749' column='1'/>
> @@ -3972,13 +3971,13 @@
>          <var-decl name='atomic_flags' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='797' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='10112'>
> -        <var-decl name='restart_block' type-id='type-id-709'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='799' column='1'/>
> +        <var-decl name='restart_block' type-id='type-id-708'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='799' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='10496'>
> -        <var-decl name='pid' type-id='type-id-710' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='801' column='1'/>
> +        <var-decl name='pid' type-id='type-id-709' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='801' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='10528'>
> -        <var-decl name='tgid' type-id='type-id-710' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='802' column='1'/>
> +        <var-decl name='tgid' type-id='type-id-709' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='802' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='10560'>
>          <var-decl name='stack_canary' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='806' column='1'/>
> @@ -4020,10 +4019,10 @@
>          <var-decl name='vfork_done' type-id='type-id-500'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='842' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='12224'>
> -        <var-decl name='set_child_tid' type-id='type-id-711'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='845' column='1'/>
> +        <var-decl name='set_child_tid' type-id='type-id-710'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='845' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='12288'>
> -        <var-decl name='clear_child_tid' type-id='type-id-711'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='848' column='1'/>
> +        <var-decl name='clear_child_tid' type-id='type-id-710'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='848' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='12352'>
>          <var-decl name='utime' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='850' column='1'/>
> @@ -4041,7 +4040,7 @@
>          <var-decl name='max_state' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='859' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='12672'>
> -        <var-decl name='prev_cputime' type-id='type-id-712'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='861' column='1'/>
> +        <var-decl name='prev_cputime' type-id='type-id-711'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='861' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='12864'>
>          <var-decl name='nvcsw' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='870' column='1'/>
> @@ -4062,7 +4061,7 @@
>          <var-decl name='maj_flt' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='881' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='13248'>
> -        <var-decl name='cputime_expires' type-id='type-id-713'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='884' column='1'/>
> +        <var-decl name='cputime_expires' type-id='type-id-712'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='884' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='13440'>
>          <var-decl name='cpu_timers' type-id='type-id-159'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='885' column='1'/>
> @@ -4077,40 +4076,40 @@
>          <var-decl name='cred' type-id='type-id-367' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='897' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14016'>
> -        <var-decl name='cached_requested_key' type-id='type-id-714'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='901' column='1'/>
> +        <var-decl name='cached_requested_key' type-id='type-id-713'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='901' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14080'>
>          <var-decl name='comm' type-id='type-id-29' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='911' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14208'>
> -        <var-decl name='nameidata' type-id='type-id-715'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='913' column='1'/>
> +        <var-decl name='nameidata' type-id='type-id-714'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='913' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14272'>
> -        <var-decl name='fs' type-id='type-id-716' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='924' column='1'/>
> +        <var-decl name='fs' type-id='type-id-715' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='924' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14336'>
> -        <var-decl name='files' type-id='type-id-717' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='927' column='1'/>
> +        <var-decl name='files' type-id='type-id-716' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='927' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14400'>
> -        <var-decl name='nsproxy' type-id='type-id-718'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='930' column='1'/>
> +        <var-decl name='nsproxy' type-id='type-id-717'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='930' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14464'>
> -        <var-decl name='signal' type-id='type-id-719'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='933' column='1'/>
> +        <var-decl name='signal' type-id='type-id-718'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='933' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14528'>
> -        <var-decl name='sighand' type-id='type-id-720'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='934' column='1'/>
> +        <var-decl name='sighand' type-id='type-id-719'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='934' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14592'>
> -        <var-decl name='blocked' type-id='type-id-721'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='935' column='1'/>
> +        <var-decl name='blocked' type-id='type-id-720'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='935' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14656'>
> -        <var-decl name='real_blocked' type-id='type-id-721'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='936' column='1'/>
> +        <var-decl name='real_blocked' type-id='type-id-720'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='936' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14720'>
> -        <var-decl name='saved_sigmask' type-id='type-id-721'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='938' column='1'/>
> +        <var-decl name='saved_sigmask' type-id='type-id-720'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='938' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14784'>
> -        <var-decl name='pending' type-id='type-id-722'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='939' column='1'/>
> +        <var-decl name='pending' type-id='type-id-721'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='939' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='14976'>
>          <var-decl name='sas_ss_sp' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='940' column='1'/>
> @@ -4125,7 +4124,7 @@
>          <var-decl name='task_works' type-id='type-id-374'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='944' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15232'>
> -        <var-decl name='audit_context' type-id='type-id-723'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='948' column='1'/>
> +        <var-decl name='audit_context' type-id='type-id-722'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='948' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15296'>
>          <var-decl name='loginuid' type-id='type-id-393'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='950' column='1'/>
> @@ -4134,7 +4133,7 @@
>          <var-decl name='sessionid' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='951' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15360'>
> -        <var-decl name='seccomp' type-id='type-id-724'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='953' column='1'/>
> +        <var-decl name='seccomp' type-id='type-id-723'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='953' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15488'>
>          <var-decl name='parent_exec_id' type-id='type-id-197'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='956' column='1'/>
> @@ -4146,49 +4145,49 @@
>          <var-decl name='alloc_lock' type-id='type-id-234'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='960' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15584'>
> -        <var-decl name='pi_lock' type-id='type-id-611'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='963' column='1'/>
> +        <var-decl name='pi_lock' type-id='type-id-605'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='963' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15616'>
> -        <var-decl name='wake_q' type-id='type-id-725'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='965' column='1'/>
> +        <var-decl name='wake_q' type-id='type-id-724'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='965' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15680'>
> -        <var-decl name='pi_waiters' type-id='type-id-608'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='969' column='1'/>
> +        <var-decl name='pi_waiters' type-id='type-id-602'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='969' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15808'>
>          <var-decl name='pi_top_task' type-id='type-id-292'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='971' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15872'>
> -        <var-decl name='pi_blocked_on' type-id='type-id-726'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='973' column='1'/>
> +        <var-decl name='pi_blocked_on' type-id='type-id-725'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='973' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='15936'>
>          <var-decl name='journal_info' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1010' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16000'>
> -        <var-decl name='bio_list' type-id='type-id-727'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1013' column='1'/>
> +        <var-decl name='bio_list' type-id='type-id-726'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1013' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16064'>
> -        <var-decl name='plug' type-id='type-id-728' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1017' column='1'/>
> +        <var-decl name='plug' type-id='type-id-727' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1017' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16128'>
> -        <var-decl name='reclaim_state' type-id='type-id-729'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1021' column='1'/>
> +        <var-decl name='reclaim_state' type-id='type-id-728'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1021' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16192'>
>          <var-decl name='backing_dev_info' type-id='type-id-460'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1023' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16256'>
> -        <var-decl name='io_context' type-id='type-id-730'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1025' column='1'/>
> +        <var-decl name='io_context' type-id='type-id-729'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1025' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16320'>
> -        <var-decl name='capture_control' type-id='type-id-731'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1028' column='1'/>
> +        <var-decl name='capture_control' type-id='type-id-730'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1028' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16384'>
>          <var-decl name='ptrace_message' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1031' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16448'>
> -        <var-decl name='last_siginfo' type-id='type-id-732'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1032' column='1'/>
> +        <var-decl name='last_siginfo' type-id='type-id-731'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1032' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16512'>
> -        <var-decl name='ioac' type-id='type-id-733' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1034' column='1'/>
> +        <var-decl name='ioac' type-id='type-id-732' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1034' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17024'>
>          <var-decl name='psi_flags' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1037' column='1'/>
> @@ -4203,7 +4202,7 @@
>          <var-decl name='acct_timexpd' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1045' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17280'>
> -        <var-decl name='mems_allowed' type-id='type-id-734'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1049' column='1'/>
> +        <var-decl name='mems_allowed' type-id='type-id-733'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1049' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17344'>
>          <var-decl name='mems_allowed_seq' type-id='type-id-378'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1051' column='1'/>
> @@ -4215,22 +4214,22 @@
>          <var-decl name='cpuset_slab_spread_rotor' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1053' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17472'>
> -        <var-decl name='cgroups' type-id='type-id-735'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1057' column='1'/>
> +        <var-decl name='cgroups' type-id='type-id-734'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1057' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17536'>
>          <var-decl name='cg_list' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1059' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17664'>
> -        <var-decl name='robust_list' type-id='type-id-736'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1066' column='1'/>
> +        <var-decl name='robust_list' type-id='type-id-735'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1066' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17728'>
> -        <var-decl name='compat_robust_list' type-id='type-id-737'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1068' column='1'/>
> +        <var-decl name='compat_robust_list' type-id='type-id-736'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1068' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17792'>
>          <var-decl name='pi_state_list' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1070' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17920'>
> -        <var-decl name='pi_state_cache' type-id='type-id-738'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1071' column='1'/>
> +        <var-decl name='pi_state_cache' type-id='type-id-737'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1071' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='17984'>
>          <var-decl name='perf_event_ctxp' type-id='type-id-179'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1074' column='1'/>
> @@ -4245,16 +4244,16 @@
>          <var-decl name='preempt_disable_ip' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1079' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='18560'>
> -        <var-decl name='tlb_ubc' type-id='type-id-739'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1147' column='1'/>
> +        <var-decl name='tlb_ubc' type-id='type-id-738'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1147' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='18560'>
>          <var-decl name='rcu' type-id='type-id-372' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1149' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='18688'>
> -        <var-decl name='splice_pipe' type-id='type-id-740'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1152' column='1'/>
> +        <var-decl name='splice_pipe' type-id='type-id-739'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1152' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='18752'>
> -        <var-decl name='task_frag' type-id='type-id-741'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1154' column='1'/>
> +        <var-decl name='task_frag' type-id='type-id-740'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1154' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='18880'>
>          <var-decl name='nr_dirtied' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1168' column='1'/>
> @@ -4278,16 +4277,16 @@
>          <var-decl name='curr_ret_depth' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1191' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19200'>
> -        <var-decl name='ret_stack' type-id='type-id-742'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1194' column='1'/>
> +        <var-decl name='ret_stack' type-id='type-id-741'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1194' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19264'>
>          <var-decl name='ftrace_timestamp' type-id='type-id-166'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1197' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19328'>
> -        <var-decl name='trace_overrun' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1203' column='1'/>
> +        <var-decl name='trace_overrun' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1203' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19360'>
> -        <var-decl name='tracing_graph_pause' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1206' column='1'/>
> +        <var-decl name='tracing_graph_pause' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1206' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19392'>
>          <var-decl name='trace' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1211' column='1'/>
> @@ -4299,7 +4298,7 @@
>          <var-decl name='memcg_in_oom' type-id='type-id-592'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1232' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19584'>
> -        <var-decl name='memcg_oom_gfp_mask' type-id='type-id-607'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1233' column='1'/>
> +        <var-decl name='memcg_oom_gfp_mask' type-id='type-id-601'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1233' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19616'>
>          <var-decl name='memcg_oom_order' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1234' column='1'/>
> @@ -4311,10 +4310,10 @@
>          <var-decl name='active_memcg' type-id='type-id-592'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1240' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19776'>
> -        <var-decl name='throttle_queue' type-id='type-id-743'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1244' column='1'/>
> +        <var-decl name='throttle_queue' type-id='type-id-742'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1244' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19840'>
> -        <var-decl name='utask' type-id='type-id-744' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1248' column='1'/>
> +        <var-decl name='utask' type-id='type-id-743' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1248' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='19904'>
>          <var-decl name='pagefault_disabled' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1257' column='1'/>
> @@ -4323,39 +4322,39 @@
>          <var-decl name='oom_reaper_list' type-id='type-id-292'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1259' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='20032'>
> -        <var-decl name='stack_vm_area' type-id='type-id-745'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1262' column='1'/>
> +        <var-decl name='stack_vm_area' type-id='type-id-744'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1262' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='20096'>
> -        <var-decl name='stack_refcount' type-id='type-id-695'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1266' column='1'/>
> +        <var-decl name='stack_refcount' type-id='type-id-694'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1266' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='20160'>
>          <var-decl name='security' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1273' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='20224'>
> -        <var-decl name='thread' type-id='type-id-746'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1288' column='1'/>
> +        <var-decl name='thread' type-id='type-id-745'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='1288' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='thread_info' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='28' column='1' id='type-id-693'>
> +    <class-decl name='thread_info' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='28' column='1' id='type-id-692'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='flags' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='29' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='addr_limit' type-id='type-id-747'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='30' column='1'/>
> +        <var-decl name='addr_limit' type-id='type-id-746'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='30' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='' type-id='type-id-748' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='34' column='1'/>
> +        <var-decl name='' type-id='type-id-747' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='34' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='mm_segment_t' type-id='type-id-211'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='23' column='1' id='type-id-747'/>
> -    <union-decl name='__anonymous_union__11' 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-748'>
> +    <typedef-decl name='mm_segment_t' type-id='type-id-211'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='23' column='1' id='type-id-746'/>
> +    <union-decl name='__anonymous_union__11' 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-747'>
>        <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-749'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h'
> line='44' column='1'/>
> +        <var-decl name='preempt' type-id='type-id-748'
> 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__18' 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-749'>
> +    <class-decl name='__anonymous_struct__24' 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-748'>
>        <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>
> @@ -4363,15 +4362,15 @@
>          <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>
> -    <typedef-decl name='refcount_t' type-id='type-id-750'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/refcount.h'
> line='21' column='1' id='type-id-695'/>
> -    <class-decl name='refcount_struct' size-in-bits='32' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/refcount.h'
> line='19' column='1' id='type-id-750'>
> +    <typedef-decl name='refcount_t' type-id='type-id-749'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/refcount.h'
> line='21' column='1' id='type-id-694'/>
> +    <class-decl name='refcount_struct' size-in-bits='32' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/refcount.h'
> line='19' column='1' id='type-id-749'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='refs' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/refcount.h'
> line='20' column='1'/>
> +        <var-decl name='refs' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/refcount.h'
> line='20' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='sched_entity' size-in-bits='3584' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='457' column='1' id='type-id-697'>
> +    <class-decl name='sched_entity' size-in-bits='3584' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='457' column='1' id='type-id-696'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='load' type-id='type-id-751' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='459' column='1'/>
> +        <var-decl name='load' type-id='type-id-750' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='459' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='runnable_weight' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='460' column='1'/>
> @@ -4401,25 +4400,25 @@
>          <var-decl name='nr_migrations' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='470' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='statistics' type-id='type-id-752'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='472' column='1'/>
> +        <var-decl name='statistics' type-id='type-id-751'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='472' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2624'>
>          <var-decl name='depth' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='475' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2688'>
> -        <var-decl name='parent' type-id='type-id-753'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='476' column='1'/>
> +        <var-decl name='parent' type-id='type-id-752'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='476' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2752'>
> -        <var-decl name='cfs_rq' type-id='type-id-754'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='478' column='1'/>
> +        <var-decl name='cfs_rq' type-id='type-id-753'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='478' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2816'>
> -        <var-decl name='my_q' type-id='type-id-754' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='480' column='1'/>
> +        <var-decl name='my_q' type-id='type-id-753' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='480' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3072'>
> -        <var-decl name='avg' type-id='type-id-755' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='490' column='1'/>
> +        <var-decl name='avg' type-id='type-id-754' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='490' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='load_weight' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='333' column='1' id='type-id-751'>
> +    <class-decl name='load_weight' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='333' column='1' id='type-id-750'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='weight' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='334' column='1'/>
>        </data-member>
> @@ -4427,7 +4426,7 @@
>          <var-decl name='inv_weight' type-id='type-id-197'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='335' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='sched_statistics' size-in-bits='1728'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='421' column='1' id='type-id-752'>
> +    <class-decl name='sched_statistics' size-in-bits='1728'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='421' column='1' id='type-id-751'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='wait_start' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='423' column='1'/>
>        </data-member>
> @@ -4510,7 +4509,7 @@
>          <var-decl name='nr_wakeups_idle' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='453' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='sched_avg' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='409' column='1' id='type-id-755'>
> +    <class-decl name='sched_avg' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='409' column='1' id='type-id-754'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='last_update_time' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='410' column='1'/>
>        </data-member>
> @@ -4536,10 +4535,10 @@
>          <var-decl name='util_avg' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='417' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='util_est' type-id='type-id-756'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='418' column='1'/>
> +        <var-decl name='util_est' type-id='type-id-755'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='418' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='util_est' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='360' column='1' id='type-id-756'>
> +    <class-decl name='util_est' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='360' column='1' id='type-id-755'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='enqueued' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='361' column='1'/>
>        </data-member>
> @@ -4547,7 +4546,7 @@
>          <var-decl name='ewma' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='362' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='sched_rt_entity' size-in-bits='576' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='494' column='1' id='type-id-698'>
> +    <class-decl name='sched_rt_entity' size-in-bits='576' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='494' column='1' id='type-id-697'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='run_list' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='495' column='1'/>
>        </data-member>
> @@ -4567,19 +4566,19 @@
>          <var-decl name='on_list' type-id='type-id-219'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='500' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='back' type-id='type-id-757' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='502' column='1'/>
> +        <var-decl name='back' type-id='type-id-756' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='502' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='parent' type-id='type-id-757'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='504' column='1'/>
> +        <var-decl name='parent' type-id='type-id-756'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='504' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='rt_rq' type-id='type-id-758' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='506' column='1'/>
> +        <var-decl name='rt_rq' type-id='type-id-757' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='506' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='my_q' type-id='type-id-758' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='508' column='1'/>
> +        <var-decl name='my_q' type-id='type-id-757' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='508' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='sched_dl_entity' size-in-bits='1728'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='512' column='1' id='type-id-700'>
> +    <class-decl name='sched_dl_entity' size-in-bits='1728'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='512' column='1' id='type-id-699'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='rb_node' type-id='type-id-184'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='513' column='1'/>
>        </data-member>
> @@ -4623,24 +4622,24 @@
>          <var-decl name='dl_overrun' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='563' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='dl_timer' type-id='type-id-759'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='569' column='1'/>
> +        <var-decl name='dl_timer' type-id='type-id-758'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='569' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1216'>
> -        <var-decl name='inactive_timer' type-id='type-id-759'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='578' column='1'/>
> +        <var-decl name='inactive_timer' type-id='type-id-758'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='578' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='hrtimer' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='107' column='1' id='type-id-759'>
> +    <class-decl name='hrtimer' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='107' column='1' id='type-id-758'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='node' type-id='type-id-760' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='108' column='1'/>
> +        <var-decl name='node' type-id='type-id-759' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='108' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='_softexpires' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='109' column='1'/>
> +        <var-decl name='_softexpires' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='109' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='function' type-id='type-id-762'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='110' column='1'/>
> +        <var-decl name='function' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='110' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='base' type-id='type-id-763' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='111' column='1'/>
> +        <var-decl name='base' type-id='type-id-762' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='111' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <var-decl name='state' type-id='type-id-203' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='112' column='1'/>
> @@ -4652,49 +4651,49 @@
>          <var-decl name='is_soft' type-id='type-id-203'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='114' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='timerqueue_node' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='9' column='1' id='type-id-760'>
> +    <class-decl name='timerqueue_node' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='9' column='1' id='type-id-759'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='node' type-id='type-id-184' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='10' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='expires' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='11' column='1'/>
> +        <var-decl name='expires' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='11' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='ktime_t' type-id='type-id-511'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ktime.h'
> line='28' column='1' id='type-id-761'/>
> -    <enum-decl name='hrtimer_restart'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='56' column='1' id='type-id-764'>
> +    <typedef-decl name='ktime_t' type-id='type-id-511'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ktime.h'
> line='28' column='1' id='type-id-760'/>
> +    <enum-decl name='hrtimer_restart'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='56' column='1' id='type-id-763'>
>        <underlying-type type-id='type-id-207'/>
>        <enumerator name='HRTIMER_NORESTART' value='0'/>
>        <enumerator name='HRTIMER_RESTART' value='1'/>
>      </enum-decl>
>      <class-decl name='hrtimer_clock_base' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='147' column='1' id='type-id-146'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='cpu_base' type-id='type-id-765'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='148' column='1'/>
> +        <var-decl name='cpu_base' type-id='type-id-764'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='148' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='index' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='149' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='clockid' type-id='type-id-766'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='150' column='1'/>
> +        <var-decl name='clockid' type-id='type-id-765'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='150' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='seq' type-id='type-id-378' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='151' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='running' type-id='type-id-767'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='152' column='1'/>
> +        <var-decl name='running' type-id='type-id-766'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='152' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='active' type-id='type-id-768'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='153' column='1'/>
> +        <var-decl name='active' type-id='type-id-767'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='153' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='get_time' type-id='type-id-769'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='154' column='1'/>
> +        <var-decl name='get_time' type-id='type-id-768'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='154' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='offset' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='155' column='1'/>
> +        <var-decl name='offset' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='155' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='hrtimer_cpu_base' size-in-bits='4608'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='198' column='1' id='type-id-770'>
> +    <class-decl name='hrtimer_cpu_base' size-in-bits='4608'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='198' column='1' id='type-id-769'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='lock' type-id='type-id-611' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='199' column='1'/>
> +        <var-decl name='lock' type-id='type-id-605' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='199' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='cpu' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='200' column='1'/>
> @@ -4730,46 +4729,46 @@
>          <var-decl name='max_hang_time' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='211' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='expires_next' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='213' column='1'/>
> +        <var-decl name='expires_next' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='213' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='next_timer' type-id='type-id-767'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='214' column='1'/>
> +        <var-decl name='next_timer' type-id='type-id-766'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='214' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='softirq_expires_next' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='215' column='1'/>
> +        <var-decl name='softirq_expires_next' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='215' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='softirq_next_timer' type-id='type-id-767'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='216' column='1'/>
> +        <var-decl name='softirq_next_timer' type-id='type-id-766'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='216' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
>          <var-decl name='clock_base' type-id='type-id-147'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/hrtimer.h'
> line='217' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='clockid_t' type-id='type-id-771'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='27' column='1' id='type-id-766'/>
> -    <typedef-decl name='__kernel_clockid_t' type-id='type-id-150'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='93' column='1' id='type-id-771'/>
> -    <class-decl name='timerqueue_head' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='14' column='1' id='type-id-768'>
> +    <typedef-decl name='clockid_t' type-id='type-id-770'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='27' column='1' id='type-id-765'/>
> +    <typedef-decl name='__kernel_clockid_t' type-id='type-id-150'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='93' column='1' id='type-id-770'/>
> +    <class-decl name='timerqueue_head' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='14' column='1' id='type-id-767'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='head' type-id='type-id-610' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='15' column='1'/>
> +        <var-decl name='head' type-id='type-id-604' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='15' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='next' type-id='type-id-772' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='16' column='1'/>
> +        <var-decl name='next' type-id='type-id-771' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/timerqueue.h'
> line='16' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='cpumask_t' type-id='type-id-773'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cpumask.h'
> line='16' column='1' id='type-id-702'/>
> -    <class-decl name='cpumask' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cpumask.h'
> line='16' column='1' id='type-id-773'>
> +    <typedef-decl name='cpumask_t' type-id='type-id-772'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cpumask.h'
> line='16' column='1' id='type-id-701'/>
> +    <class-decl name='cpumask' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cpumask.h'
> line='16' column='1' id='type-id-772'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='bits' type-id='type-id-212' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cpumask.h'
> line='16' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='rcu_special' size-in-bits='32' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='616' column='1' id='type-id-703'>
> +    <union-decl name='rcu_special' size-in-bits='32' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='616' column='1' id='type-id-702'>
>        <data-member access='private'>
> -        <var-decl name='b' type-id='type-id-774' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='622' column='1'/>
> +        <var-decl name='b' type-id='type-id-773' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='622' column='1'/>
>        </data-member>
>        <data-member access='private'>
>          <var-decl name='s' type-id='type-id-197' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='623' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__19' 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-774'>
> +    <class-decl name='__anonymous_struct__25' 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-773'>
>        <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>
> @@ -4783,7 +4782,7 @@
>          <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>
> -    <class-decl name='sched_info' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='298' column='1' id='type-id-705'>
> +    <class-decl name='sched_info' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='298' column='1' id='type-id-704'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='pcount' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='303' column='1'/>
>        </data-member>
> @@ -4797,7 +4796,7 @@
>          <var-decl name='last_queued' type-id='type-id-166'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='314' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='plist_node' size-in-bits='320' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/plist.h'
> line='83' column='1' id='type-id-706'>
> +    <class-decl name='plist_node' size-in-bits='320' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/plist.h'
> line='83' column='1' id='type-id-705'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='prio' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/plist.h'
> line='84' column='1'/>
>        </data-member>
> @@ -4808,7 +4807,7 @@
>          <var-decl name='node_list' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/plist.h'
> line='86' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='vmacache' size-in-bits='320' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='34' column='1' id='type-id-707'>
> +    <class-decl name='vmacache' size-in-bits='320' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='34' column='1' id='type-id-706'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='seqnum' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='35' column='1'/>
>        </data-member>
> @@ -4816,7 +4815,7 @@
>          <var-decl name='vmas' type-id='type-id-223' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='36' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='task_rss_stat' size-in-bits='160' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='50' column='1' id='type-id-708'>
> +    <class-decl name='task_rss_stat' size-in-bits='160' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='50' column='1' id='type-id-707'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='events' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='51' column='1'/>
>        </data-member>
> @@ -4824,28 +4823,28 @@
>          <var-decl name='count' type-id='type-id-151' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='52' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='restart_block' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='25' column='1' id='type-id-709'>
> +    <class-decl name='restart_block' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='25' column='1' id='type-id-708'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='fn' type-id='type-id-775' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='26' column='1'/>
> +        <var-decl name='fn' type-id='type-id-774' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='26' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='' type-id='type-id-776' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='27' column='1'/>
> +        <var-decl name='' type-id='type-id-775' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='27' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__12' 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-776'>
> +    <union-decl name='__anonymous_union__12' 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-775'>
>        <data-member access='private'>
> -        <var-decl name='futex' type-id='type-id-777' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='36' column='1'/>
> +        <var-decl name='futex' type-id='type-id-776' 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-778'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='46' column='1'/>
> +        <var-decl name='nanosleep' type-id='type-id-777'
> 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-779' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='54' column='1'/>
> +        <var-decl name='poll' type-id='type-id-778' 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__20' 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-777'>
> +    <class-decl name='__anonymous_struct__26' 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-776'>
>        <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'/>
> +        <var-decl name='uaddr' type-id='type-id-779' 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'/>
> @@ -4860,58 +4859,58 @@
>          <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'/>
> +        <var-decl name='uaddr2' type-id='type-id-779'
> 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__21' 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-778'>
> +    <class-decl name='__anonymous_struct__27' 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-777'>
>        <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'/>
> +        <var-decl name='clockid' type-id='type-id-765'
> 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'/>
> +        <var-decl name='type' type-id='type-id-780' 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-782' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='41' column='1'/>
> +        <var-decl name='' type-id='type-id-781' 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>
> -    <enum-decl name='timespec_type'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='16' column='1' id='type-id-781'>
> +    <enum-decl name='timespec_type'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h'
> line='16' column='1' id='type-id-780'>
>        <underlying-type type-id='type-id-207'/>
>        <enumerator name='TT_NONE' value='0'/>
>        <enumerator name='TT_NATIVE' value='1'/>
>        <enumerator name='TT_COMPAT' value='2'/>
>      </enum-decl>
> -    <union-decl name='__anonymous_union__13' 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-782'>
> +    <union-decl name='__anonymous_union__13' 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-781'>
>        <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'/>
> +        <var-decl name='rmtp' type-id='type-id-782' 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'/>
> +        <var-decl name='compat_rmtp' type-id='type-id-783'
> 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='__kernel_timespec' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/time_types.h'
> line='7' column='1' id='type-id-785'>
> +    <class-decl name='__kernel_timespec' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/time_types.h'
> line='7' column='1' id='type-id-784'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tv_sec' type-id='type-id-786'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/time_types.h'
> line='8' column='1'/>
> +        <var-decl name='tv_sec' type-id='type-id-785'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/time_types.h'
> line='8' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='tv_nsec' type-id='type-id-165'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/time_types.h'
> line='9' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='__kernel_time64_t' type-id='type-id-165'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='90' column='1' id='type-id-786'/>
> -    <class-decl name='old_timespec32' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time32.h'
> line='19' column='1' id='type-id-787'>
> +    <typedef-decl name='__kernel_time64_t' type-id='type-id-165'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='90' column='1' id='type-id-785'/>
> +    <class-decl name='old_timespec32' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time32.h'
> line='19' column='1' id='type-id-786'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='tv_sec' type-id='type-id-788'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time32.h'
> line='20' column='1'/>
> +        <var-decl name='tv_sec' type-id='type-id-787'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time32.h'
> line='20' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='tv_nsec' type-id='type-id-260'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time32.h'
> line='21' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='old_time32_t' type-id='type-id-260'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time32.h'
> line='17' column='1' id='type-id-788'/>
> -    <class-decl name='__anonymous_struct__22' 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-779'>
> +    <typedef-decl name='old_time32_t' type-id='type-id-260'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/time32.h'
> line='17' column='1' id='type-id-787'/>
> +    <class-decl name='__anonymous_struct__28' 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-778'>
>        <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'/>
> +        <var-decl name='ufds' type-id='type-id-788' 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'/>
> @@ -4926,11 +4925,11 @@
>          <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>
> -    <typedef-decl name='pid_t' type-id='type-id-790'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='22' column='1' id='type-id-710'/>
> -    <typedef-decl name='__kernel_pid_t' type-id='type-id-150'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='28' column='1' id='type-id-790'/>
> -    <class-decl name='pid' size-in-bits='768' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid.h'
> line='59' column='1' id='type-id-791'>
> +    <typedef-decl name='pid_t' type-id='type-id-789'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='22' column='1' id='type-id-709'/>
> +    <typedef-decl name='__kernel_pid_t' type-id='type-id-150'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='28' column='1' id='type-id-789'/>
> +    <class-decl name='pid' size-in-bits='768' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid.h'
> line='59' column='1' id='type-id-790'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='count' type-id='type-id-695' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid.h'
> line='61' column='1'/>
> +        <var-decl name='count' type-id='type-id-694' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid.h'
> line='61' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='level' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid.h'
> line='62' column='1'/>
> @@ -4953,15 +4952,15 @@
>          <var-decl name='nr' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid.h'
> line='55' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='ns' type-id='type-id-792' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid.h'
> line='56' column='1'/>
> +        <var-decl name='ns' type-id='type-id-791' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid.h'
> line='56' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='pid_namespace' size-in-bits='1600' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='24' column='1' id='type-id-793'>
> +    <class-decl name='pid_namespace' size-in-bits='1600' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='24' column='1' id='type-id-792'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='kref' type-id='type-id-327' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='25' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='idr' type-id='type-id-794' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='26' column='1'/>
> +        <var-decl name='idr' type-id='type-id-793' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='26' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <var-decl name='rcu' type-id='type-id-372' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='27' column='1'/>
> @@ -4973,13 +4972,13 @@
>          <var-decl name='child_reaper' type-id='type-id-292'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='29' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='pid_cachep' type-id='type-id-596'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='30' column='1'/>
> +        <var-decl name='pid_cachep' type-id='type-id-632'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='30' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
>          <var-decl name='level' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='31' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='parent' type-id='type-id-792'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='32' column='1'/>
> +        <var-decl name='parent' type-id='type-id-791'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='32' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
>          <var-decl name='proc_mnt' type-id='type-id-376'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='34' column='1'/>
> @@ -4994,7 +4993,7 @@
>          <var-decl name='user_ns' type-id='type-id-466'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='41' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
> -        <var-decl name='ucounts' type-id='type-id-795'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='42' column='1'/>
> +        <var-decl name='ucounts' type-id='type-id-794'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='42' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
>          <var-decl name='proc_work' type-id='type-id-241'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='43' column='1'/>
> @@ -5009,17 +5008,17 @@
>          <var-decl name='reboot' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='46' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1408'>
> -        <var-decl name='ns' type-id='type-id-796' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='47' column='1'/>
> +        <var-decl name='ns' type-id='type-id-795' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pid_namespace.h'
> line='47' column='1'/>
>        </data-member>
>      </class-decl>
>      <class-decl name='kref' size-in-bits='32' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kref.h'
> line='19' column='1' id='type-id-327'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='refcount' type-id='type-id-695'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kref.h'
> line='20' column='1'/>
> +        <var-decl name='refcount' type-id='type-id-694'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kref.h'
> line='20' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='idr' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/idr.h'
> line='19' column='1' id='type-id-794'>
> +    <class-decl name='idr' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/idr.h'
> line='19' column='1' id='type-id-793'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='idr_rt' type-id='type-id-606'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/idr.h'
> line='20' column='1'/>
> +        <var-decl name='idr_rt' type-id='type-id-600'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/idr.h'
> line='20' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='idr_base' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/idr.h'
> line='21' column='1'/>
> @@ -5028,18 +5027,18 @@
>          <var-decl name='idr_next' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/idr.h'
> line='22' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='ns_common' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ns_common.h'
> line='7' column='1' id='type-id-796'>
> +    <class-decl name='ns_common' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ns_common.h'
> line='7' column='1' id='type-id-795'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='stashed' type-id='type-id-17'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ns_common.h'
> line='8' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='ops' type-id='type-id-797' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ns_common.h'
> line='9' column='1'/>
> +        <var-decl name='ops' type-id='type-id-796' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ns_common.h'
> line='9' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='inum' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ns_common.h'
> line='10' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='prev_cputime' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='239' column='1' id='type-id-712'>
> +    <class-decl name='prev_cputime' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='239' column='1' id='type-id-711'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='utime' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='241' column='1'/>
>        </data-member>
> @@ -5047,10 +5046,10 @@
>          <var-decl name='stime' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='242' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='lock' type-id='type-id-611' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='243' column='1'/>
> +        <var-decl name='lock' type-id='type-id-605' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='243' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='task_cputime' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='257' column='1' id='type-id-713'>
> +    <class-decl name='task_cputime' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='257' column='1' id='type-id-712'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='utime' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='258' column='1'/>
>        </data-member>
> @@ -5061,9 +5060,9 @@
>          <var-decl name='sum_exec_runtime' type-id='type-id-166'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='260' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='cred' size-in-bits='1344' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='111' column='1' id='type-id-798'>
> +    <class-decl name='cred' size-in-bits='1344' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='111' column='1' id='type-id-797'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='usage' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='112' column='1'/>
> +        <var-decl name='usage' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='112' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='uid' type-id='type-id-393' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='120' column='1'/>
> @@ -5093,78 +5092,78 @@
>          <var-decl name='securebits' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='128' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='cap_inheritable' type-id='type-id-799'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='129' column='1'/>
> +        <var-decl name='cap_inheritable' type-id='type-id-798'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='129' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='cap_permitted' type-id='type-id-799'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='130' column='1'/>
> +        <var-decl name='cap_permitted' type-id='type-id-798'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='130' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='cap_effective' type-id='type-id-799'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='131' column='1'/>
> +        <var-decl name='cap_effective' type-id='type-id-798'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='131' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='cap_bset' type-id='type-id-799'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='132' column='1'/>
> +        <var-decl name='cap_bset' type-id='type-id-798'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='132' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='cap_ambient' type-id='type-id-799'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='133' column='1'/>
> +        <var-decl name='cap_ambient' type-id='type-id-798'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='133' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
>          <var-decl name='jit_keyring' type-id='type-id-208'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='135' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='session_keyring' type-id='type-id-714'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='137' column='1'/>
> +        <var-decl name='session_keyring' type-id='type-id-713'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='137' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='process_keyring' type-id='type-id-714'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='138' column='1'/>
> +        <var-decl name='process_keyring' type-id='type-id-713'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='138' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
> -        <var-decl name='thread_keyring' type-id='type-id-714'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='139' column='1'/>
> +        <var-decl name='thread_keyring' type-id='type-id-713'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='139' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='request_key_auth' type-id='type-id-714'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='140' column='1'/>
> +        <var-decl name='request_key_auth' type-id='type-id-713'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='140' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
>          <var-decl name='security' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='143' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
> -        <var-decl name='user' type-id='type-id-800' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='145' column='1'/>
> +        <var-decl name='user' type-id='type-id-799' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='145' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
>          <var-decl name='user_ns' type-id='type-id-466'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='146' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
> -        <var-decl name='group_info' type-id='type-id-801'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='147' column='1'/>
> +        <var-decl name='group_info' type-id='type-id-800'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='147' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1216'>
> -        <var-decl name='' type-id='type-id-802' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='149' column='1'/>
> +        <var-decl name='' type-id='type-id-801' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='149' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='kernel_cap_t' type-id='type-id-803'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/capability.h'
> line='26' column='1' id='type-id-799'/>
> -    <class-decl name='kernel_cap_struct' size-in-bits='64'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/capability.h'
> line='24' column='1' id='type-id-803'>
> +    <typedef-decl name='kernel_cap_t' type-id='type-id-802'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/capability.h'
> line='26' column='1' id='type-id-798'/>
> +    <class-decl name='kernel_cap_struct' size-in-bits='64'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/capability.h'
> line='24' column='1' id='type-id-802'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='cap' type-id='type-id-3' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/capability.h'
> line='25' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='key' size-in-bits='1728' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='172' column='1' id='type-id-804'>
> +    <class-decl name='key' size-in-bits='1728' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='172' column='1' id='type-id-803'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='usage' type-id='type-id-695' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='173' column='1'/>
> +        <var-decl name='usage' type-id='type-id-694' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='173' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='serial' type-id='type-id-805'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='174' column='1'/>
> +        <var-decl name='serial' type-id='type-id-804'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='174' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='' type-id='type-id-806' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='175' column='1'/>
> +        <var-decl name='' type-id='type-id-805' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='175' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <var-decl name='sem' type-id='type-id-399' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='179' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
> -        <var-decl name='user' type-id='type-id-807' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='180' column='1'/>
> +        <var-decl name='user' type-id='type-id-806' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='180' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
>          <var-decl name='security' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='181' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='' type-id='type-id-808' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='182' column='1'/>
> +        <var-decl name='' type-id='type-id-807' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='182' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
>          <var-decl name='last_used_at' type-id='type-id-443'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='186' column='1'/>
> @@ -5176,7 +5175,7 @@
>          <var-decl name='gid' type-id='type-id-155' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='188' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='perm' type-id='type-id-809' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='189' column='1'/>
> +        <var-decl name='perm' type-id='type-id-808' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='189' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='928'>
>          <var-decl name='quotalen' type-id='type-id-219'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='190' column='1'/>
> @@ -5191,18 +5190,18 @@
>          <var-decl name='flags' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='202' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
> -        <var-decl name='' type-id='type-id-810' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='219' column='1'/>
> +        <var-decl name='' type-id='type-id-809' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='219' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1408'>
> -        <var-decl name='' type-id='type-id-811' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='234' column='1'/>
> +        <var-decl name='' type-id='type-id-810' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='234' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1664'>
> -        <var-decl name='restrict_link' type-id='type-id-812'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='254' column='1'/>
> +        <var-decl name='restrict_link' type-id='type-id-811'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='254' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='key_serial_t' type-id='type-id-813'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='28' column='1' id='type-id-805'/>
> -    <typedef-decl name='int32_t' type-id='type-id-260'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='103' column='1' id='type-id-813'/>
> -    <union-decl name='__anonymous_union__14' size-in-bits='192'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='175' column='1' id='type-id-806'>
> +    <typedef-decl name='key_serial_t' type-id='type-id-812'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='28' column='1' id='type-id-804'/>
> +    <typedef-decl name='int32_t' type-id='type-id-260'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='103' column='1' id='type-id-812'/>
> +    <union-decl name='__anonymous_union__14' size-in-bits='192'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='175' column='1' id='type-id-805'>
>        <data-member access='private'>
>          <var-decl name='graveyard_link' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='176' column='1'/>
>        </data-member>
> @@ -5210,7 +5209,7 @@
>          <var-decl name='serial_node' type-id='type-id-184'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='177' column='1'/>
>        </data-member>
>      </union-decl>
> -    <union-decl name='__anonymous_union__15' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='182' column='1' id='type-id-808'>
> +    <union-decl name='__anonymous_union__15' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='182' column='1' id='type-id-807'>
>        <data-member access='private'>
>          <var-decl name='expiry' type-id='type-id-443'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='183' column='1'/>
>        </data-member>
> @@ -5218,60 +5217,60 @@
>          <var-decl name='revoked_at' type-id='type-id-443'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='184' column='1'/>
>        </data-member>
>      </union-decl>
> -    <typedef-decl name='key_perm_t' type-id='type-id-446'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='31' column='1' id='type-id-809'/>
> -    <union-decl name='__anonymous_union__16' size-in-bits='320'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='219' column='1' id='type-id-810'>
> +    <typedef-decl name='key_perm_t' type-id='type-id-446'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='31' column='1' id='type-id-808'/>
> +    <union-decl name='__anonymous_union__16' size-in-bits='320'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='219' column='1' id='type-id-809'>
>        <data-member access='private'>
> -        <var-decl name='index_key' type-id='type-id-814'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='220' column='1'/>
> +        <var-decl name='index_key' type-id='type-id-813'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='220' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-815' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='221' column='1'/>
> +        <var-decl name='' type-id='type-id-814' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='221' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='keyring_index_key' size-in-bits='320'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='91' column='1' id='type-id-814'>
> +    <class-decl name='keyring_index_key' size-in-bits='320'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='91' column='1' id='type-id-813'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='hash' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='93' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='' type-id='type-id-816' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='94' column='1'/>
> +        <var-decl name='' type-id='type-id-815' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='94' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='type' type-id='type-id-817' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='106' column='1'/>
> +        <var-decl name='type' type-id='type-id-816' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='106' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='domain_tag' type-id='type-id-818'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='107' column='1'/>
> +        <var-decl name='domain_tag' type-id='type-id-817'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='107' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <var-decl name='description' type-id='type-id-228'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='108' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__17' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='94' column='1' id='type-id-816'>
> +    <union-decl name='__anonymous_union__17' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='94' column='1' id='type-id-815'>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-819' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='95' column='1'/>
> +        <var-decl name='' type-id='type-id-818' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='95' column='1'/>
>        </data-member>
>        <data-member access='private'>
>          <var-decl name='x' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='104' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__23' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='95' column='1' id='type-id-819'>
> +    <class-decl name='__anonymous_struct__29' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='95' column='1' id='type-id-818'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='desc_len' type-id='type-id-272'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='97' column='1'/>
> +        <var-decl name='desc_len' type-id='type-id-275'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='97' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='16'>
>          <var-decl name='desc' type-id='type-id-37' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='98' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='key_tag' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='85' column='1' id='type-id-820'>
> +    <class-decl name='key_tag' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='85' column='1' id='type-id-819'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='rcu' type-id='type-id-372' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='86' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='usage' type-id='type-id-695' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='87' column='1'/>
> +        <var-decl name='usage' type-id='type-id-694' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='87' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='160'>
>          <var-decl name='removed' type-id='type-id-235'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='88' column='1'/>
>        </data-member>
>      </class-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/key.h'
> line='221' column='1' id='type-id-815'>
> +    <class-decl name='__anonymous_struct__30' size-in-bits='320'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='221' column='1' id='type-id-814'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='hash' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='222' column='1'/>
>        </data-member>
> @@ -5279,24 +5278,24 @@
>          <var-decl name='len_desc' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='223' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='type' type-id='type-id-817' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='224' column='1'/>
> +        <var-decl name='type' type-id='type-id-816' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='224' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='domain_tag' type-id='type-id-818'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='225' column='1'/>
> +        <var-decl name='domain_tag' type-id='type-id-817'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='225' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <var-decl name='description' type-id='type-id-24'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='226' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__18' size-in-bits='256'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='234' column='1' id='type-id-811'>
> +    <union-decl name='__anonymous_union__18' size-in-bits='256'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='234' column='1' id='type-id-810'>
>        <data-member access='private'>
> -        <var-decl name='payload' type-id='type-id-821'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='235' column='1'/>
> +        <var-decl name='payload' type-id='type-id-820'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='235' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-822' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='236' column='1'/>
> +        <var-decl name='' type-id='type-id-821' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='236' column='1'/>
>        </data-member>
>      </union-decl>
> -    <union-decl name='key_payload' size-in-bits='256'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='111' column='1' id='type-id-821'>
> +    <union-decl name='key_payload' size-in-bits='256'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='111' column='1' id='type-id-820'>
>        <data-member access='private'>
>          <var-decl name='rcu_data0' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='112' column='1'/>
>        </data-member>
> @@ -5304,43 +5303,43 @@
>          <var-decl name='data' type-id='type-id-226' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='113' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__25' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='236' column='1' id='type-id-822'>
> +    <class-decl name='__anonymous_struct__31' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='236' column='1' id='type-id-821'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='name_link' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='238' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='keys' type-id='type-id-823' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='239' column='1'/>
> +        <var-decl name='keys' type-id='type-id-822' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='239' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='assoc_array' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/assoc_array.h'
> line='22' column='1' id='type-id-823'>
> +    <class-decl name='assoc_array' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/assoc_array.h'
> line='22' column='1' id='type-id-822'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='root' type-id='type-id-824' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/assoc_array.h'
> line='23' column='1'/>
> +        <var-decl name='root' type-id='type-id-823' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/assoc_array.h'
> line='23' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='nr_leaves_on_tree' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/assoc_array.h'
> line='24' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='key_restriction' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='153' column='1' id='type-id-825'>
> +    <class-decl name='key_restriction' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='153' column='1' id='type-id-824'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='check' type-id='type-id-826' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='154' column='1'/>
> +        <var-decl name='check' type-id='type-id-825' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='154' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='key' type-id='type-id-714' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='155' column='1'/>
> +        <var-decl name='key' type-id='type-id-713' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='155' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='keytype' type-id='type-id-817'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='156' column='1'/>
> +        <var-decl name='keytype' type-id='type-id-816'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='156' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='key_restrict_link_func_t' type-id='type-id-827'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='148' column='1' id='type-id-826'/>
> -    <class-decl name='user_struct' size-in-bits='960' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='13' column='1' id='type-id-828'>
> +    <typedef-decl name='key_restrict_link_func_t' type-id='type-id-826'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h'
> line='148' column='1' id='type-id-825'/>
> +    <class-decl name='user_struct' size-in-bits='960' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='13' column='1' id='type-id-827'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='__count' type-id='type-id-695'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='14' column='1'/>
> +        <var-decl name='__count' type-id='type-id-694'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='14' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='processes' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='15' column='1'/>
> +        <var-decl name='processes' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='15' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='sigpending' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='16' column='1'/>
> +        <var-decl name='sigpending' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='16' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='epoll_watches' type-id='type-id-17'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='21' column='1'/>
> @@ -5364,12 +5363,12 @@
>          <var-decl name='locked_vm' type-id='type-id-17'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='37' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='ratelimit' type-id='type-id-829'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='41' column='1'/>
> +        <var-decl name='ratelimit' type-id='type-id-828'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/user.h'
> line='41' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='ratelimit_state' size-in-bits='320' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ratelimit.h'
> line='15' column='1' id='type-id-829'>
> +    <class-decl name='ratelimit_state' size-in-bits='320' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ratelimit.h'
> line='15' column='1' id='type-id-828'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='lock' type-id='type-id-611' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ratelimit.h'
> line='16' column='1'/>
> +        <var-decl name='lock' type-id='type-id-605' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ratelimit.h'
> line='16' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='interval' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ratelimit.h'
> line='18' column='1'/>
> @@ -5390,9 +5389,9 @@
>          <var-decl name='flags' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ratelimit.h'
> line='23' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='group_info' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='25' column='1' id='type-id-830'>
> +    <class-decl name='group_info' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='25' column='1' id='type-id-829'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='usage' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='26' column='1'/>
> +        <var-decl name='usage' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='26' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='ngroups' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='27' column='1'/>
> @@ -5401,7 +5400,7 @@
>          <var-decl name='gid' type-id='type-id-156' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='28' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__19' size-in-bits='128'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='149' column='1' id='type-id-802'>
> +    <union-decl name='__anonymous_union__19' size-in-bits='128'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='149' column='1' id='type-id-801'>
>        <data-member access='private'>
>          <var-decl name='non_rcu' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='150' column='1'/>
>        </data-member>
> @@ -5409,35 +5408,35 @@
>          <var-decl name='rcu' type-id='type-id-372' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h'
> line='151' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='nsproxy' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='31' column='1' id='type-id-831'>
> +    <class-decl name='nsproxy' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='31' column='1' id='type-id-830'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='count' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='32' column='1'/>
> +        <var-decl name='count' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='32' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='uts_ns' type-id='type-id-832'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='33' column='1'/>
> +        <var-decl name='uts_ns' type-id='type-id-831'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='33' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='ipc_ns' type-id='type-id-833'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='34' column='1'/>
> +        <var-decl name='ipc_ns' type-id='type-id-832'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='34' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='mnt_ns' type-id='type-id-834'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='35' column='1'/>
> +        <var-decl name='mnt_ns' type-id='type-id-833'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='35' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='pid_ns_for_children' type-id='type-id-792'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='36' column='1'/>
> +        <var-decl name='pid_ns_for_children' type-id='type-id-791'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='36' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='net_ns' type-id='type-id-835'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='37' column='1'/>
> +        <var-decl name='net_ns' type-id='type-id-834'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='37' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='cgroup_ns' type-id='type-id-836'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='38' column='1'/>
> +        <var-decl name='cgroup_ns' type-id='type-id-835'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nsproxy.h'
> line='38' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='signal_struct' size-in-bits='8064' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='85' column='1' id='type-id-837'>
> +    <class-decl name='signal_struct' size-in-bits='8064' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='85' column='1' id='type-id-836'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='sigcnt' type-id='type-id-695'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='86' column='1'/>
> +        <var-decl name='sigcnt' type-id='type-id-694'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='86' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='live' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='87' column='1'/>
> +        <var-decl name='live' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='87' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='nr_threads' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='88' column='1'/>
> @@ -5452,7 +5451,7 @@
>          <var-decl name='curr_target' type-id='type-id-292'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='94' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='shared_pending' type-id='type-id-722'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='97' column='1'/>
> +        <var-decl name='shared_pending' type-id='type-id-721'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='97' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
>          <var-decl name='multiprocess' type-id='type-id-142'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='100' column='1'/>
> @@ -5485,19 +5484,19 @@
>          <var-decl name='posix_timers' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='132' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
> -        <var-decl name='real_timer' type-id='type-id-759'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='135' column='1'/>
> +        <var-decl name='real_timer' type-id='type-id-758'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='135' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1664'>
> -        <var-decl name='it_real_incr' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='136' column='1'/>
> +        <var-decl name='it_real_incr' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='136' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1728'>
>          <var-decl name='it' type-id='type-id-141' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='143' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1984'>
> -        <var-decl name='cputimer' type-id='type-id-838'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='149' column='1'/>
> +        <var-decl name='cputimer' type-id='type-id-837'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='149' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2240'>
> -        <var-decl name='cputime_expires' type-id='type-id-713'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='152' column='1'/>
> +        <var-decl name='cputime_expires' type-id='type-id-712'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='152' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='2432'>
>          <var-decl name='cpu_timers' type-id='type-id-159'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='154' column='1'/>
> @@ -5512,13 +5511,13 @@
>          <var-decl name='leader' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='168' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3200'>
> -        <var-decl name='tty' type-id='type-id-839' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='170' column='1'/>
> +        <var-decl name='tty' type-id='type-id-838' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='170' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3264'>
> -        <var-decl name='autogroup' type-id='type-id-840'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='173' column='1'/>
> +        <var-decl name='autogroup' type-id='type-id-839'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='173' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3328'>
> -        <var-decl name='stats_lock' type-id='type-id-841'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='181' column='1'/>
> +        <var-decl name='stats_lock' type-id='type-id-840'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='181' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3392'>
>          <var-decl name='utime' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='182' column='1'/>
> @@ -5539,7 +5538,7 @@
>          <var-decl name='cgtime' type-id='type-id-201'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='184' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3776'>
> -        <var-decl name='prev_cputime' type-id='type-id-712'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='185' column='1'/>
> +        <var-decl name='prev_cputime' type-id='type-id-711'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='185' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='3968'>
>          <var-decl name='nvcsw' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='186' column='1'/>
> @@ -5584,7 +5583,7 @@
>          <var-decl name='cmaxrss' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='189' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='4864'>
> -        <var-decl name='ioac' type-id='type-id-733' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='190' column='1'/>
> +        <var-decl name='ioac' type-id='type-id-732' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='190' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5376'>
>          <var-decl name='sum_sched_runtime' type-id='type-id-166'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='198' column='1'/>
> @@ -5593,13 +5592,13 @@
>          <var-decl name='rlim' type-id='type-id-187' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='209' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7488'>
> -        <var-decl name='stats' type-id='type-id-842' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='215' column='1'/>
> +        <var-decl name='stats' type-id='type-id-841' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='215' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7552'>
>          <var-decl name='audit_tty' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='218' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7616'>
> -        <var-decl name='tty_audit_buf' type-id='type-id-843'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='219' column='1'/>
> +        <var-decl name='tty_audit_buf' type-id='type-id-842'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='219' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7680'>
>          <var-decl name='oom_flag_origin' type-id='type-id-235'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='226' column='1'/>
> @@ -5611,22 +5610,22 @@
>          <var-decl name='oom_score_adj_min' type-id='type-id-190'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='228' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7744'>
> -        <var-decl name='oom_mm' type-id='type-id-640'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='230' column='1'/>
> +        <var-decl name='oom_mm' type-id='type-id-639'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='230' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7808'>
>          <var-decl name='cred_guard_mutex' type-id='type-id-302'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='233' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='sigpending' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='30' column='1' id='type-id-722'>
> +    <class-decl name='sigpending' size-in-bits='192' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='30' column='1' id='type-id-721'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='list' type-id='type-id-158' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='31' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='signal' type-id='type-id-721'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='32' column='1'/>
> +        <var-decl name='signal' type-id='type-id-720'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='32' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='sigset_t' type-id='type-id-844'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal.h'
> line='92' column='1' id='type-id-721'/>
> -    <class-decl name='__anonymous_struct__26' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-721'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal.h'
> line='90' column='1' id='type-id-844'>
> +    <typedef-decl name='sigset_t' type-id='type-id-843'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal.h'
> line='92' column='1' id='type-id-720'/>
> +    <class-decl name='__anonymous_struct__32' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-720'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal.h'
> line='90' column='1' id='type-id-843'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='sig' type-id='type-id-212' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal.h'
> line='91' column='1'/>
>        </data-member>
> @@ -5639,9 +5638,9 @@
>          <var-decl name='incr' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='37' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='thread_group_cputimer' size-in-bits='256'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='67' column='1' id='type-id-838'>
> +    <class-decl name='thread_group_cputimer' size-in-bits='256'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='67' column='1' id='type-id-837'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='cputime_atomic' type-id='type-id-845'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='68' column='1'/>
> +        <var-decl name='cputime_atomic' type-id='type-id-844'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='68' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <var-decl name='running' type-id='type-id-235'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='69' column='1'/>
> @@ -5650,7 +5649,7 @@
>          <var-decl name='checking_timer' type-id='type-id-235'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='70' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='task_cputime_atomic' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='44' column='1' id='type-id-845'>
> +    <class-decl name='task_cputime_atomic' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='44' column='1' id='type-id-844'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='utime' type-id='type-id-402' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='45' column='1'/>
>        </data-member>
> @@ -5661,8 +5660,8 @@
>          <var-decl name='sum_exec_runtime' type-id='type-id-402'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='47' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='seqlock_t' type-id='type-id-846'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seqlock.h'
> line='407' column='1' id='type-id-841'/>
> -    <class-decl name='__anonymous_struct__27' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-841'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seqlock.h'
> line='404' column='1' id='type-id-846'>
> +    <typedef-decl name='seqlock_t' type-id='type-id-845'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seqlock.h'
> line='407' column='1' id='type-id-840'/>
> +    <class-decl name='__anonymous_struct__33' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-840'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seqlock.h'
> line='404' column='1' id='type-id-845'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='seqcount' type-id='type-id-386'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seqlock.h'
> line='405' column='1'/>
>        </data-member>
> @@ -5670,7 +5669,7 @@
>          <var-decl name='lock' type-id='type-id-234' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seqlock.h'
> line='406' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='task_io_accounting' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/task_io_accounting.h'
> line='12' column='1' id='type-id-733'>
> +    <class-decl name='task_io_accounting' size-in-bits='512'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/task_io_accounting.h'
> line='12' column='1' id='type-id-732'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='rchar' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/task_io_accounting.h'
> line='15' column='1'/>
>        </data-member>
> @@ -5704,12 +5703,12 @@
>          <var-decl name='rlim_max' type-id='type-id-351'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/linux/resource.h'
> line='45' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='sighand_struct' size-in-bits='16640'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='17' column='1' id='type-id-847'>
> +    <class-decl name='sighand_struct' size-in-bits='16640'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='17' column='1' id='type-id-846'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='siglock' type-id='type-id-234'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='18' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='count' type-id='type-id-695' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='19' column='1'/>
> +        <var-decl name='count' type-id='type-id-694' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='19' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='signalfd_wqh' type-id='type-id-243'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched/signal.h'
> line='20' column='1'/>
> @@ -5720,49 +5719,49 @@
>      </class-decl>
>      <class-decl name='k_sigaction' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='49' column='1' id='type-id-152'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='sa' type-id='type-id-848' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='50' column='1'/>
> +        <var-decl name='sa' type-id='type-id-847' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='50' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='sigaction' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='35' column='1' id='type-id-848'>
> +    <class-decl name='sigaction' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='35' column='1' id='type-id-847'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='sa_handler' type-id='type-id-849'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='37' column='1'/>
> +        <var-decl name='sa_handler' type-id='type-id-848'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='37' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='sa_flags' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='38' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='sa_restorer' type-id='type-id-850'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='44' column='1'/>
> +        <var-decl name='sa_restorer' type-id='type-id-849'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='44' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='sa_mask' type-id='type-id-721'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='46' column='1'/>
> +        <var-decl name='sa_mask' type-id='type-id-720'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='46' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='__sighandler_t' type-id='type-id-851'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h'
> line='19' column='1' id='type-id-849'/>
> -    <typedef-decl name='__signalfn_t' type-id='type-id-852'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h'
> line='18' column='1' id='type-id-853'/>
> -    <typedef-decl name='__sigrestore_t' type-id='type-id-854'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h'
> line='22' column='1' id='type-id-850'/>
> -    <typedef-decl name='__restorefn_t' type-id='type-id-855'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h'
> line='21' column='1' id='type-id-856'/>
> -    <class-decl name='seccomp' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seccomp.h'
> line='29' column='1' id='type-id-724'>
> +    <typedef-decl name='__sighandler_t' type-id='type-id-850'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h'
> line='19' column='1' id='type-id-848'/>
> +    <typedef-decl name='__signalfn_t' type-id='type-id-851'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h'
> line='18' column='1' id='type-id-852'/>
> +    <typedef-decl name='__sigrestore_t' type-id='type-id-853'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h'
> line='22' column='1' id='type-id-849'/>
> +    <typedef-decl name='__restorefn_t' type-id='type-id-854'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/signal-defs.h'
> line='21' column='1' id='type-id-855'/>
> +    <class-decl name='seccomp' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seccomp.h'
> line='29' column='1' id='type-id-723'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='mode' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seccomp.h'
> line='30' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='filter' type-id='type-id-857'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seccomp.h'
> line='31' column='1'/>
> +        <var-decl name='filter' type-id='type-id-856'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/seccomp.h'
> line='31' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='wake_q_node' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='633' column='1' id='type-id-725'>
> +    <class-decl name='wake_q_node' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='633' column='1' id='type-id-724'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-858' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='634' column='1'/>
> +        <var-decl name='next' type-id='type-id-857' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h'
> line='634' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='io_context' size-in-bits='832' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='98' column='1' id='type-id-859'>
> +    <class-decl name='io_context' size-in-bits='832' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='98' column='1' id='type-id-858'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='refcount' type-id='type-id-17'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='99' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='active_ref' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='100' column='1'/>
> +        <var-decl name='active_ref' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='100' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='96'>
> -        <var-decl name='nr_tasks' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='101' column='1'/>
> +        <var-decl name='nr_tasks' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='101' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='lock' type-id='type-id-234' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='104' column='1'/>
> @@ -5777,10 +5776,10 @@
>          <var-decl name='last_waited' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='112' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='icq_tree' type-id='type-id-606'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='114' column='1'/>
> +        <var-decl name='icq_tree' type-id='type-id-600'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='114' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
> -        <var-decl name='icq_hint' type-id='type-id-860'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='115' column='1'/>
> +        <var-decl name='icq_hint' type-id='type-id-859'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='115' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
>          <var-decl name='icq_list' type-id='type-id-142'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='116' column='1'/>
> @@ -5789,32 +5788,32 @@
>          <var-decl name='release_work' type-id='type-id-241'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='118' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='io_cq' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='72' column='1' id='type-id-861'>
> +    <class-decl name='io_cq' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='72' column='1' id='type-id-860'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='q' type-id='type-id-743' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='73' column='1'/>
> +        <var-decl name='q' type-id='type-id-742' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='73' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='ioc' type-id='type-id-730' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='74' column='1'/>
> +        <var-decl name='ioc' type-id='type-id-729' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='74' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='' type-id='type-id-862' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='82' column='1'/>
> +        <var-decl name='' type-id='type-id-861' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='82' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='' type-id='type-id-863' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='86' column='1'/>
> +        <var-decl name='' type-id='type-id-862' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='86' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <var-decl name='flags' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='91' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__anonymous_union__20' size-in-bits='128'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='82' column='1' id='type-id-862'>
> +    <union-decl name='__anonymous_union__20' size-in-bits='128'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='82' column='1' id='type-id-861'>
>        <data-member access='private'>
>          <var-decl name='q_node' type-id='type-id-158'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='83' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='__rcu_icq_cache' type-id='type-id-596'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='84' column='1'/>
> +        <var-decl name='__rcu_icq_cache' type-id='type-id-632'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='84' column='1'/>
>        </data-member>
>      </union-decl>
> -    <union-decl name='__anonymous_union__21' size-in-bits='128'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='86' column='1' id='type-id-863'>
> +    <union-decl name='__anonymous_union__21' size-in-bits='128'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='86' column='1' id='type-id-862'>
>        <data-member access='private'>
>          <var-decl name='ioc_node' type-id='type-id-144'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='87' column='1'/>
>        </data-member>
> @@ -5822,13 +5821,13 @@
>          <var-decl name='__rcu_head' type-id='type-id-372'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h'
> line='88' column='1'/>
>        </data-member>
>      </union-decl>
> -    <typedef-decl name='kernel_siginfo_t' type-id='type-id-864'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='14' column='1' id='type-id-865'/>
> -    <class-decl name='kernel_siginfo' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='12' column='1' id='type-id-864'>
> +    <typedef-decl name='kernel_siginfo_t' type-id='type-id-863'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='14' column='1' id='type-id-864'/>
> +    <class-decl name='kernel_siginfo' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='12' column='1' id='type-id-863'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='' type-id='type-id-866' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='13' column='1'/>
> +        <var-decl name='' type-id='type-id-865' 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__28' 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-866'>
> +    <class-decl name='__anonymous_struct__34' 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-865'>
>        <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>
> @@ -5839,57 +5838,57 @@
>          <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'/>
> +        <var-decl name='_sifields' type-id='type-id-866'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/signal_types.h'
> line='13' column='1'/>
>        </data-member>
>      </class-decl>
> -    <union-decl name='__sifields' size-in-bits='256' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='32' column='1' id='type-id-867'>
> +    <union-decl name='__sifields' size-in-bits='256' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='32' column='1' id='type-id-866'>
>        <data-member access='private'>
> -        <var-decl name='_kill' type-id='type-id-868' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='37' column='1'/>
> +        <var-decl name='_kill' type-id='type-id-867' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='37' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='_timer' type-id='type-id-869'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='45' column='1'/>
> +        <var-decl name='_timer' type-id='type-id-868'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='45' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='_rt' type-id='type-id-870' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='52' column='1'/>
> +        <var-decl name='_rt' type-id='type-id-869' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='52' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='_sigchld' type-id='type-id-871'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='61' column='1'/>
> +        <var-decl name='_sigchld' type-id='type-id-870'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='61' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='_sigfault' type-id='type-id-872'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='95' column='1'/>
> +        <var-decl name='_sigfault' type-id='type-id-871'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='95' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='_sigpoll' type-id='type-id-873'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='101' column='1'/>
> +        <var-decl name='_sigpoll' type-id='type-id-872'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='101' column='1'/>
>        </data-member>
>        <data-member access='private'>
> -        <var-decl name='_sigsys' type-id='type-id-874'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='108' column='1'/>
> +        <var-decl name='_sigsys' type-id='type-id-873'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='108' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__29' 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-868'>
> +    <class-decl name='__anonymous_struct__35' 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-867'>
>        <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'/>
> +        <var-decl name='_pid' type-id='type-id-789' 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__30' 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-869'>
> +    <class-decl name='__anonymous_struct__36' 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-868'>
>        <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'/>
> +        <var-decl name='_tid' type-id='type-id-874' 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'/>
> +        <var-decl name='_sigval' type-id='type-id-875'
> 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>
> -    <typedef-decl name='__kernel_timer_t' type-id='type-id-150'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='92' column='1' id='type-id-875'/>
> -    <typedef-decl name='sigval_t' type-id='type-id-877'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='11' column='1' id='type-id-876'/>
> -    <union-decl name='sigval' size-in-bits='64' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='8' column='1' id='type-id-877'>
> +    <typedef-decl name='__kernel_timer_t' type-id='type-id-150'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='92' column='1' id='type-id-874'/>
> +    <typedef-decl name='sigval_t' type-id='type-id-876'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='11' column='1' id='type-id-875'/>
> +    <union-decl name='sigval' size-in-bits='64' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='8' column='1' id='type-id-876'>
>        <data-member access='private'>
>          <var-decl name='sival_int' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='9' column='1'/>
>        </data-member>
> @@ -5897,20 +5896,20 @@
>          <var-decl name='sival_ptr' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='10' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__31' 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-870'>
> +    <class-decl name='__anonymous_struct__37' 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-869'>
>        <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'/>
> +        <var-decl name='_pid' type-id='type-id-789' 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'/>
> +        <var-decl name='_sigval' type-id='type-id-875'
> 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__32' 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-871'>
> +    <class-decl name='__anonymous_struct__38' 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-870'>
>        <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'/>
> +        <var-decl name='_pid' type-id='type-id-789' 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'/>
> @@ -5919,33 +5918,33 @@
>          <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'/>
> +        <var-decl name='_utime' type-id='type-id-877'
> 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'/>
> +        <var-decl name='_stime' type-id='type-id-877'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='60' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='__kernel_clock_t' type-id='type-id-347'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='91' column='1' id='type-id-878'/>
> -    <class-decl name='__anonymous_struct__33' 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-872'>
> +    <typedef-decl name='__kernel_clock_t' type-id='type-id-347'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h'
> line='91' column='1' id='type-id-877'/>
> +    <class-decl name='__anonymous_struct__39' 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-871'>
>        <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-879' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='77' column='1'/>
> +        <var-decl name='' type-id='type-id-878' 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__22' 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-879'>
> +    <union-decl name='__anonymous_union__22' 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-878'>
>        <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-880'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='88' column='1'/>
> +        <var-decl name='_addr_bnd' type-id='type-id-879'
> 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-881'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h'
> line='93' column='1'/>
> +        <var-decl name='_addr_pkey' type-id='type-id-880'
> 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__34' 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-880'>
> +    <class-decl name='__anonymous_struct__40' 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-879'>
>        <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>
> @@ -5956,7 +5955,7 @@
>          <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__35' 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-881'>
> +    <class-decl name='__anonymous_struct__41' 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-880'>
>        <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>
> @@ -5964,7 +5963,7 @@
>          <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__36' 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-873'>
> +    <class-decl name='__anonymous_struct__42' 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-872'>
>        <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>
> @@ -5972,7 +5971,7 @@
>          <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__37' 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-874'>
> +    <class-decl name='__anonymous_struct__43' 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-873'>
>        <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>
> @@ -5983,16 +5982,16 @@
>          <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>
> -    <typedef-decl name='nodemask_t' type-id='type-id-882'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nodemask.h'
> line='98' column='1' id='type-id-734'/>
> -    <class-decl name='__anonymous_struct__38' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-734'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nodemask.h'
> line='98' column='1' id='type-id-882'>
> +    <typedef-decl name='nodemask_t' type-id='type-id-881'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nodemask.h'
> line='98' column='1' id='type-id-733'/>
> +    <class-decl name='__anonymous_struct__44' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-733'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nodemask.h'
> line='98' column='1' id='type-id-881'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='bits' type-id='type-id-212' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nodemask.h'
> line='98' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='tlbflush_unmap_batch' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='72' column='1' id='type-id-739'/>
> -    <class-decl name='page_frag' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='60' column='1' id='type-id-741'>
> +    <class-decl name='tlbflush_unmap_batch' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='72' column='1' id='type-id-738'/>
> +    <class-decl name='page_frag' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='60' column='1' id='type-id-740'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='page' type-id='type-id-638' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='61' column='1'/>
> +        <var-decl name='page' type-id='type-id-635' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='61' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='offset' type-id='type-id-2' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='63' column='1'/>
> @@ -6001,60 +6000,61 @@
>          <var-decl name='size' type-id='type-id-2' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types_task.h'
> line='64' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='uprobe_task' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='61' column='1' id='type-id-883'>
> +    <class-decl name='uprobe_task' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='61' column='1' id='type-id-882'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='state' type-id='type-id-884' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='62' column='1'/>
> +        <var-decl name='state' type-id='type-id-883' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='62' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='' type-id='type-id-885' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='64' column='1'/>
> +        <var-decl name='' type-id='type-id-884' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='64' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='active_uprobe' type-id='type-id-886'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='76' column='1'/>
> +        <var-decl name='active_uprobe' type-id='type-id-885'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='76' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <var-decl name='xol_vaddr' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='77' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='return_instances' type-id='type-id-887'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='79' column='1'/>
> +        <var-decl name='return_instances' type-id='type-id-886'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='79' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <var-decl name='depth' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='80' column='1'/>
>        </data-member>
>      </class-decl>
> -    <enum-decl name='uprobe_task_state'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='51' column='1' id='type-id-884'>
> +    <enum-decl name='uprobe_task_state'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='51' column='1' id='type-id-883'>
>        <underlying-type type-id='type-id-207'/>
>        <enumerator name='UTASK_RUNNING' value='0'/>
>        <enumerator name='UTASK_SSTEP' value='1'/>
>        <enumerator name='UTASK_SSTEP_ACK' value='2'/>
>        <enumerator name='UTASK_SSTEP_TRAPPED' value='3'/>
>      </enum-decl>
> -    <union-decl name='__anonymous_union__23' 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-885'>
> -      <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-888'>
> -          <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>
> +    <union-decl name='__anonymous_union__23' 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-884'>
>        <data-member access='private'>
> -        <var-decl name='' type-id='type-id-889' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='65' column='1'/>
> +        <var-decl name='' type-id='type-id-887' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='65' column='1'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-888' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='70' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__39' 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-889'>
> +    <class-decl name='__anonymous_struct__45' 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-887'>
>        <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'/>
> +        <var-decl name='autask' type-id='type-id-889'
> 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='arch_uprobe_task' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/uprobes.h'
> line='21' column='1' id='type-id-890'/>
> -    <class-decl name='return_instance' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='83' column='1' id='type-id-891'>
> +    <class-decl name='arch_uprobe_task' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/uprobes.h'
> line='21' column='1' id='type-id-889'/>
> +    <class-decl name='__anonymous_struct__46' 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-888'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='uprobe' type-id='type-id-886'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='84' column='1'/>
> +        <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>
> +    <class-decl name='return_instance' size-in-bits='384' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='83' column='1' id='type-id-890'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='uprobe' type-id='type-id-885'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='84' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='func' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='85' column='1'/>
> @@ -6069,12 +6069,12 @@
>          <var-decl name='chained' type-id='type-id-235'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='88' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='next' type-id='type-id-887' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='90' column='1'/>
> +        <var-decl name='next' type-id='type-id-886' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='90' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='vm_struct' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='39' column='1' id='type-id-892'>
> +    <class-decl name='vm_struct' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='39' column='1' id='type-id-891'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='next' type-id='type-id-745' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='40' column='1'/>
> +        <var-decl name='next' type-id='type-id-744' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='40' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='addr' type-id='type-id-225' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='41' column='1'/>
> @@ -6086,25 +6086,25 @@
>          <var-decl name='flags' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='43' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='pages' type-id='type-id-893' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='44' column='1'/>
> +        <var-decl name='pages' type-id='type-id-892' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='44' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <var-decl name='nr_pages' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='45' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='phys_addr' type-id='type-id-894'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='46' column='1'/>
> +        <var-decl name='phys_addr' type-id='type-id-893'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='46' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <var-decl name='caller' type-id='type-id-225'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/vmalloc.h'
> line='47' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='phys_addr_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='158' column='1' id='type-id-894'/>
> -    <class-decl name='thread_struct' size-in-bits='8448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='126' column='1' id='type-id-746'>
> +    <typedef-decl name='phys_addr_t' type-id='type-id-201'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='158' column='1' id='type-id-893'/>
> +    <class-decl name='thread_struct' size-in-bits='8448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='126' column='1' id='type-id-745'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='cpu_context' type-id='type-id-895'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='127' column='1'/>
> +        <var-decl name='cpu_context' type-id='type-id-894'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='127' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='uw' type-id='type-id-896' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='138' column='1'/>
> +        <var-decl name='uw' type-id='type-id-895' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='138' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5248'>
>          <var-decl name='fpsimd_cpu' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='140' column='1'/>
> @@ -6125,13 +6125,13 @@
>          <var-decl name='fault_code' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='145' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='5568'>
> -        <var-decl name='debug' type-id='type-id-897' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='146' column='1'/>
> +        <var-decl name='debug' type-id='type-id-896' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='146' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='7744'>
> -        <var-decl name='keys_user' type-id='type-id-898'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='148' column='1'/>
> +        <var-decl name='keys_user' type-id='type-id-897'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='148' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='cpu_context' size-in-bits='832' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='110' column='1' id='type-id-895'>
> +    <class-decl name='cpu_context' size-in-bits='832' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='110' column='1' id='type-id-894'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='x19' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='111' column='1'/>
>        </data-member>
> @@ -6172,7 +6172,7 @@
>          <var-decl name='pc' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='123' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__40' 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-896'>
> +    <class-decl name='__anonymous_struct__47' 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-895'>
>        <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>
> @@ -6180,10 +6180,10 @@
>          <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'/>
> +        <var-decl name='fpsimd_state' type-id='type-id-898'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='137' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='user_fpsimd_state' size-in-bits='4224'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/uapi/asm/ptrace.h'
> line='81' column='1' id='type-id-899'>
> +    <class-decl name='user_fpsimd_state' size-in-bits='4224'
> is-struct='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/uapi/asm/ptrace.h'
> line='81' column='1' id='type-id-898'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='vregs' type-id='type-id-15' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/uapi/asm/ptrace.h'
> line='82' column='1'/>
>        </data-member>
> @@ -6197,7 +6197,7 @@
>          <var-decl name='__reserved' type-id='type-id-3'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/uapi/asm/ptrace.h'
> line='85' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='debug_info' size-in-bits='2176' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='97' column='1' id='type-id-897'>
> +    <class-decl name='debug_info' size-in-bits='2176' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='97' column='1' id='type-id-896'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='suspended_step' type-id='type-id-150'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='100' column='1'/>
>        </data-member>
> @@ -6214,24 +6214,24 @@
>          <var-decl name='hbp_watch' type-id='type-id-177'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/processor.h'
> line='106' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='ptrauth_keys' size-in-bits='640' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='25' column='1' id='type-id-898'>
> +    <class-decl name='ptrauth_keys' size-in-bits='640' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='25' column='1' id='type-id-897'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='apia' type-id='type-id-900' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='26' column='1'/>
> +        <var-decl name='apia' type-id='type-id-899' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='26' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='apib' type-id='type-id-900' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='27' column='1'/>
> +        <var-decl name='apib' type-id='type-id-899' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='27' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='apda' type-id='type-id-900' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='28' column='1'/>
> +        <var-decl name='apda' type-id='type-id-899' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='28' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
> -        <var-decl name='apdb' type-id='type-id-900' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='29' column='1'/>
> +        <var-decl name='apdb' type-id='type-id-899' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='29' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
> -        <var-decl name='apga' type-id='type-id-900' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='30' column='1'/>
> +        <var-decl name='apga' type-id='type-id-899' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='30' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='ptrauth_key' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='17' column='1' id='type-id-900'>
> +    <class-decl name='ptrauth_key' size-in-bits='128' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='17' column='1' id='type-id-899'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='lo' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='18' column='1'/>
>        </data-member>
> @@ -6239,9 +6239,17 @@
>          <var-decl name='hi' type-id='type-id-211' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pointer_auth.h'
> line='18' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='uprobes_state' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='101' column='1' id='type-id-650'>
> +    <class-decl name='uprobes_state' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='101' column='1' id='type-id-649'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='xol_area' type-id='type-id-901'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='102' column='1'/>
> +        <var-decl name='xol_area' type-id='type-id-900'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h'
> line='102' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <class-decl name='__anonymous_struct__48' 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-599'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='pgmap' type-id='type-id-901' 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>
>      <class-decl name='dev_pagemap' size-in-bits='1856' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/memremap.h'
> line='106' column='1' id='type-id-902'>
> @@ -6319,7 +6327,7 @@
>          <var-decl name='child' type-id='type-id-911' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/ioport.h'
> line='26' column='1'/>
>        </data-member>
>      </class-decl>
> -    <typedef-decl name='resource_size_t' type-id='type-id-894'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='163' column='1' id='type-id-910'/>
> +    <typedef-decl name='resource_size_t' type-id='type-id-893'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h'
> line='163' column='1' id='type-id-910'/>
>      <class-decl name='percpu_ref' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/percpu-refcount.h'
> line='95' column='1' id='type-id-906'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='count' type-id='type-id-17' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/percpu-refcount.h'
> line='96' column='1'/>
> @@ -6353,7 +6361,7 @@
>      </enum-decl>
>      <class-decl name='dev_pagemap_ops' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/memremap.h'
> line='66' column='1' id='type-id-915'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='page_free' type-id='type-id-623'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/memremap.h'
> line='72' column='1'/>
> +        <var-decl name='page_free' type-id='type-id-617'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/memremap.h'
> line='72' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='kill' type-id='type-id-916' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/memremap.h'
> line='77' column='1'/>
> @@ -6362,12 +6370,12 @@
>          <var-decl name='cleanup' type-id='type-id-916'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/memremap.h'
> line='82' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
> -        <var-decl name='migrate_to_ram' type-id='type-id-664'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/memremap.h'
> line='88' column='1'/>
> +        <var-decl name='migrate_to_ram' type-id='type-id-663'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/memremap.h'
> line='88' column='1'/>
>        </data-member>
>      </class-decl>
>      <union-decl name='__anonymous_union__24' 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-591'>
>        <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'/>
> +        <var-decl name='_mapcount' type-id='type-id-271'
> 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'/>
> @@ -6381,7 +6389,7 @@
>      </union-decl>
>      <class-decl name='shrink_control' size-in-bits='256' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/shrinker.h'
> line='12' column='1' id='type-id-917'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='gfp_mask' type-id='type-id-607'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/shrinker.h'
> line='13' column='1'/>
> +        <var-decl name='gfp_mask' type-id='type-id-601'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/shrinker.h'
> line='13' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
>          <var-decl name='nid' type-id='type-id-150' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/shrinker.h'
> line='16' column='1'/>
> @@ -6641,7 +6649,7 @@
>          <var-decl name='bd_disk' type-id='type-id-938'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='486' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
> -        <var-decl name='bd_queue' type-id='type-id-743'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='487' column='1'/>
> +        <var-decl name='bd_queue' type-id='type-id-742'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='487' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
>          <var-decl name='bd_bdi' type-id='type-id-460'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='488' column='1'/>
> @@ -6793,7 +6801,7 @@
>        </data-member>
>      </class-decl>
>      <typedef-decl name='uuid_t' type-id='type-id-944'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uuid.h'
> line='18' column='1' id='type-id-464'/>
> -    <class-decl name='__anonymous_struct__41' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-464'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uuid.h'
> line='16' column='1' id='type-id-944'>
> +    <class-decl name='__anonymous_struct__49' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-464'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uuid.h'
> line='16' column='1' id='type-id-944'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='b' type-id='type-id-10' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uuid.h'
> line='17' column='1'/>
>        </data-member>
> @@ -6951,10 +6959,10 @@
>          <var-decl name='write' type-id='type-id-969' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1804' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
> -        <var-decl name='read_iter' type-id='type-id-624'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1805' column='1'/>
> +        <var-decl name='read_iter' type-id='type-id-618'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1805' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
> -        <var-decl name='write_iter' type-id='type-id-624'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1806' column='1'/>
> +        <var-decl name='write_iter' type-id='type-id-618'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1806' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <var-decl name='iopoll' type-id='type-id-970'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1807' column='1'/>
> @@ -7002,7 +7010,7 @@
>          <var-decl name='sendpage' type-id='type-id-980'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1821' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1344'>
> -        <var-decl name='get_unmapped_area' type-id='type-id-643'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1822' column='1'/>
> +        <var-decl name='get_unmapped_area' type-id='type-id-642'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1822' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1408'>
>          <var-decl name='check_flags' type-id='type-id-981'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1823' column='1'/>
> @@ -7129,7 +7137,7 @@
>        </data-member>
>      </class-decl>
>      <typedef-decl name='rwlock_t' type-id='type-id-1002'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwlock_types.h'
> line='20' column='1' id='type-id-1001'/>
> -    <class-decl name='__anonymous_struct__42' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1001'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwlock_types.h'
> line='11' column='1' id='type-id-1002'>
> +    <class-decl name='__anonymous_struct__50' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1001'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwlock_types.h'
> line='11' column='1' id='type-id-1002'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='raw_lock' type-id='type-id-1003'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/rwlock_types.h'
> line='12' column='1'/>
>        </data-member>
> @@ -7145,13 +7153,13 @@
>      </class-decl>
>      <union-decl name='__anonymous_union__28' size-in-bits='32'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h'
> line='14' column='1' id='type-id-1005'>
>        <data-member access='private'>
> -        <var-decl name='cnts' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h'
> line='15' column='1'/>
> +        <var-decl name='cnts' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h'
> line='15' column='1'/>
>        </data-member>
>        <data-member access='private'>
>          <var-decl name='' type-id='type-id-1006' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h'
> line='16' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__43' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h'
> line='16' column='1' id='type-id-1006'>
> +    <class-decl name='__anonymous_struct__51' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h'
> line='16' column='1' id='type-id-1006'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='wlocked' type-id='type-id-203'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h'
> line='18' column='1'/>
>        </data-member>
> @@ -7217,7 +7225,7 @@
>          <var-decl name='owner' type-id='type-id-1021'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/nfs_fs_i.h'
> line='18' column='1'/>
>        </data-member>
>      </class-decl>
> -    <class-decl name='__anonymous_struct__44' size-in-bits='192'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1096' column='1' id='type-id-1019'>
> +    <class-decl name='__anonymous_struct__52' size-in-bits='192'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1096' column='1' id='type-id-1019'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='link' type-id='type-id-158' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='1097' column='1'/>
>        </data-member>
> @@ -7244,7 +7252,7 @@
>      </class-decl>
>      <union-decl name='__anonymous_union__30' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='707' column='1' id='type-id-406'>
>        <data-member access='private'>
> -        <var-decl name='i_pipe' type-id='type-id-740'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='708' column='1'/>
> +        <var-decl name='i_pipe' type-id='type-id-739'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='708' column='1'/>
>        </data-member>
>        <data-member access='private'>
>          <var-decl name='i_bdev' type-id='type-id-459'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h'
> line='709' column='1'/>
> @@ -7272,7 +7280,7 @@
>          <var-decl name='' type-id='type-id-1025' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/lockref.h'
> line='30' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__45' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/lockref.h'
> line='30' column='1' id='type-id-1025'>
> +    <class-decl name='__anonymous_struct__53' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/lockref.h'
> line='30' column='1' id='type-id-1025'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <var-decl name='lock' type-id='type-id-234' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/lockref.h'
> line='31' column='1'/>
>        </data-member>
> @@ -7384,10 +7392,10 @@
>      </enum-decl>
>      <class-decl name='kernfs_node' size-in-bits='1024' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='131' column='1' id='type-id-1032'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='count' type-id='type-id-273' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='132' column='1'/>
> +        <var-decl name='count' type-id='type-id-271' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='132' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='32'>
> -        <var-decl name='active' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='133' column='1'/>
> +        <var-decl name='active' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='133' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='parent' type-id='type-id-326'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='143' column='1'/>
> @@ -7439,7 +7447,7 @@
>          <var-decl name='subdirs' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='85' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
> -        <var-decl name='children' type-id='type-id-610'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='87' column='1'/>
> +        <var-decl name='children' type-id='type-id-604'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='87' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <var-decl name='root' type-id='type-id-1039' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='93' column='1'/>
> @@ -7453,7 +7461,7 @@
>          <var-decl name='flags' type-id='type-id-210' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='186' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
> -        <var-decl name='ino_idr' type-id='type-id-794'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='189' column='1'/>
> +        <var-decl name='ino_idr' type-id='type-id-793'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='189' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <var-decl name='next_generation' type-id='type-id-197'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='190' column='1'/>
> @@ -7580,7 +7588,7 @@
>          <var-decl name='released' type-id='type-id-235'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='215' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
> -        <var-decl name='vm_ops' type-id='type-id-655'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='216' column='1'/>
> +        <var-decl name='vm_ops' type-id='type-id-654'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='216' column='1'/>
>        </data-member>
>      </class-decl>
>      <union-decl name='kernfs_node_id' size-in-bits='64'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='108' column='1' id='type-id-1034'>
> @@ -7591,7 +7599,7 @@
>          <var-decl name='id' type-id='type-id-201' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h'
> line='119' column='1'/>
>        </data-member>
>      </union-decl>
> -    <class-decl name='__anonymous_struct__46' 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-1062'>
> +    <class-decl name='__anonymous_struct__54' 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-1062'>
>        <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>
> @@ -7935,7 +7943,7 @@
>          <var-decl name='may_skip_resume' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='595' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
> -        <var-decl name='suspend_timer' type-id='type-id-759'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='600' column='1'/>
> +        <var-decl name='suspend_timer' type-id='type-id-758'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='600' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
>          <var-decl name='timer_expires' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='601' column='1'/>
> @@ -7950,10 +7958,10 @@
>          <var-decl name='wakeirq' type-id='type-id-1086'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='604' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1728'>
> -        <var-decl name='usage_count' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='605' column='1'/>
> +        <var-decl name='usage_count' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='605' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1760'>
> -        <var-decl name='child_count' type-id='type-id-273'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='606' column='1'/>
> +        <var-decl name='child_count' type-id='type-id-271'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='606' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='29'>
>          <var-decl name='disable_depth' type-id='type-id-210'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm.h'
> line='607' column='1'/>
> @@ -8045,19 +8053,19 @@
>          <var-decl name='timer_expires' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='47' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
> -        <var-decl name='total_time' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='48' column='1'/>
> +        <var-decl name='total_time' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='48' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
> -        <var-decl name='max_time' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='49' column='1'/>
> +        <var-decl name='max_time' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='49' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
> -        <var-decl name='last_time' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='50' column='1'/>
> +        <var-decl name='last_time' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='50' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
> -        <var-decl name='start_prevent_time' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='51' column='1'/>
> +        <var-decl name='start_prevent_time' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='51' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
> -        <var-decl name='prevent_sleep_time' type-id='type-id-761'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='52' column='1'/>
> +        <var-decl name='prevent_sleep_time' type-id='type-id-760'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='52' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
>          <var-decl name='event_count' type-id='type-id-211'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/pm_wakeup.h'
> line='53' column='1'/>
> @@ -9242,7 +9250,7 @@
>      </class-decl>
>      <class-decl name='sg_mapping_iter' size-in-bits='576' is-struct='yes'
> visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/scatterlist.h'
> line='447' column='1' id='type-id-238'>
>        <data-member access='public' layout-offset-in-bits='0'>
> -        <var-decl name='page' type-id='type-id-638' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/scatterlist.h'
> line='449' column='1'/>
> +        <var-decl name='page' type-id='type-id-635' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/scatterlist.h'
> line='449' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <var-decl name='addr' type-id='type-id-225' visibility='default'
> filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/scatterlist.h'
> line='450' column='1'/>
> @@ -9281,23 +9289,23 @@
>        </data-member>
>      </class-decl>
>      <pointer-type-def type-id='type-id-537' size-in-bits='64'
> id='type-id-535'/>
> -    <pointer-type-def type-id='type-id-785' size-in-bits='64'
> id='type-id-783'/>
> -    <pointer-type-def type-id='type-id-856' size-in-bits='64'
> id='type-id-854'/>
> -    <pointer-type-def type-id='type-id-853' size-in-bits='64'
> id='type-id-851'/>
> +    <pointer-type-def type-id='type-id-784' size-in-bits='64'
> id='type-id-782'/>
> +    <pointer-type-def type-id='type-id-855' size-in-bits='64'
> id='type-id-853'/>
> +    <pointer-type-def type-id='type-id-852' size-in-bits='64'
> id='type-id-850'/>
>      <pointer-type-def type-id='type-id-405' size-in-bits='64'
> id='type-id-369'/>
> -    <pointer-type-def type-id='type-id-41' size-in-bits='64'
> id='type-id-654'/>
> -    <pointer-type-def type-id='type-id-42' size-in-bits='64'
> id='type-id-824'/>
> +    <pointer-type-def type-id='type-id-41' size-in-bits='64'
> id='type-id-653'/>
> +    <pointer-type-def type-id='type-id-42' size-in-bits='64'
> id='type-id-823'/>
>      <pointer-type-def type-id='type-id-17' size-in-bits='64'
> id='type-id-959'/>
>      <pointer-type-def type-id='type-id-348' size-in-bits='64'
> id='type-id-1184'/>
>      <pointer-type-def type-id='type-id-1184' size-in-bits='64'
> id='type-id-338'/>
> -    <pointer-type-def type-id='type-id-43' size-in-bits='64'
> id='type-id-723'/>
> -    <pointer-type-def type-id='type-id-44' size-in-bits='64'
> id='type-id-840'/>
> +    <pointer-type-def type-id='type-id-43' size-in-bits='64'
> id='type-id-722'/>
> +    <pointer-type-def type-id='type-id-44' size-in-bits='64'
> id='type-id-839'/>
>      <pointer-type-def type-id='type-id-45' size-in-bits='64'
> id='type-id-460'/>
>      <pointer-type-def type-id='type-id-46' size-in-bits='64'
> id='type-id-400'/>
>      <pointer-type-def type-id='type-id-356' size-in-bits='64'
> id='type-id-1185'/>
>      <pointer-type-def type-id='type-id-1185' size-in-bits='64'
> id='type-id-355'/>
> -    <pointer-type-def type-id='type-id-47' size-in-bits='64'
> id='type-id-727'/>
> -    <pointer-type-def type-id='type-id-48' size-in-bits='64'
> id='type-id-728'/>
> +    <pointer-type-def type-id='type-id-47' size-in-bits='64'
> id='type-id-726'/>
> +    <pointer-type-def type-id='type-id-48' size-in-bits='64'
> id='type-id-727'/>
>      <pointer-type-def type-id='type-id-936' size-in-bits='64'
> id='type-id-459'/>
>      <pointer-type-def type-id='type-id-235' size-in-bits='64'
> id='type-id-1186'/>
>      <pointer-type-def type-id='type-id-554' size-in-bits='64'
> id='type-id-493'/>
> @@ -9305,22 +9313,22 @@
>      <pointer-type-def type-id='type-id-1069' size-in-bits='64'
> id='type-id-300'/>
>      <pointer-type-def type-id='type-id-372' size-in-bits='64'
> id='type-id-374'/>
>      <pointer-type-def type-id='type-id-374' size-in-bits='64'
> id='type-id-21'/>
> -    <pointer-type-def type-id='type-id-49' size-in-bits='64'
> id='type-id-731'/>
> +    <pointer-type-def type-id='type-id-49' size-in-bits='64'
> id='type-id-730'/>
>      <pointer-type-def type-id='type-id-50' size-in-bits='64'
> id='type-id-1023'/>
> -    <pointer-type-def type-id='type-id-51' size-in-bits='64'
> id='type-id-754'/>
> -    <pointer-type-def type-id='type-id-52' size-in-bits='64'
> id='type-id-836'/>
> +    <pointer-type-def type-id='type-id-51' size-in-bits='64'
> id='type-id-753'/>
> +    <pointer-type-def type-id='type-id-52' size-in-bits='64'
> id='type-id-835'/>
>      <pointer-type-def type-id='type-id-23' size-in-bits='64'
> id='type-id-24'/>
>      <pointer-type-def type-id='type-id-1187' size-in-bits='64'
> id='type-id-953'/>
>      <pointer-type-def type-id='type-id-1188' size-in-bits='64'
> id='type-id-1139'/>
>      <pointer-type-def type-id='type-id-1189' size-in-bits='64'
> id='type-id-1065'/>
>      <pointer-type-def type-id='type-id-1138' size-in-bits='64'
> id='type-id-317'/>
>      <pointer-type-def type-id='type-id-53' size-in-bits='64'
> id='type-id-312'/>
> -    <pointer-type-def type-id='type-id-54' size-in-bits='64'
> id='type-id-737'/>
> +    <pointer-type-def type-id='type-id-54' size-in-bits='64'
> id='type-id-736'/>
>      <pointer-type-def type-id='type-id-262' size-in-bits='64'
> id='type-id-500'/>
>      <qualified-type-def type-id='type-id-1080' const='yes'
> id='type-id-1190'/>
>      <pointer-type-def type-id='type-id-1190' size-in-bits='64'
> id='type-id-1077'/>
> -    <qualified-type-def type-id='type-id-612' const='yes'
> id='type-id-1191'/>
> -    <pointer-type-def type-id='type-id-1191' size-in-bits='64'
> id='type-id-609'/>
> +    <qualified-type-def type-id='type-id-606' const='yes'
> id='type-id-1191'/>
> +    <pointer-type-def type-id='type-id-1191' size-in-bits='64'
> id='type-id-603'/>
>      <qualified-type-def type-id='type-id-352' const='yes'
> id='type-id-1192'/>
>      <pointer-type-def type-id='type-id-1192' size-in-bits='64'
> id='type-id-1193'/>
>      <pointer-type-def type-id='type-id-1193' size-in-bits='64'
> id='type-id-318'/>
> @@ -9329,11 +9337,11 @@
>      <pointer-type-def type-id='type-id-1195' size-in-bits='64'
> id='type-id-417'/>
>      <pointer-type-def type-id='type-id-1196' size-in-bits='64'
> id='type-id-1197'/>
>      <qualified-type-def type-id='type-id-1197' const='yes'
> id='type-id-332'/>
> -    <pointer-type-def type-id='type-id-1198' size-in-bits='64'
> id='type-id-669'/>
> +    <pointer-type-def type-id='type-id-1198' size-in-bits='64'
> id='type-id-668'/>
>      <pointer-type-def type-id='type-id-228' size-in-bits='64'
> id='type-id-494'/>
> -    <qualified-type-def type-id='type-id-702' const='yes'
> id='type-id-1199'/>
> -    <pointer-type-def type-id='type-id-1199' size-in-bits='64'
> id='type-id-701'/>
> -    <qualified-type-def type-id='type-id-798' const='yes'
> id='type-id-1200'/>
> +    <qualified-type-def type-id='type-id-701' const='yes'
> id='type-id-1199'/>
> +    <pointer-type-def type-id='type-id-1199' size-in-bits='64'
> id='type-id-700'/>
> +    <qualified-type-def type-id='type-id-797' const='yes'
> id='type-id-1200'/>
>      <pointer-type-def type-id='type-id-1200' size-in-bits='64'
> id='type-id-367'/>
>      <qualified-type-def type-id='type-id-377' const='yes'
> id='type-id-1201'/>
>      <pointer-type-def type-id='type-id-1201' size-in-bits='64'
> id='type-id-1202'/>
> @@ -9380,7 +9388,7 @@
>      <pointer-type-def type-id='type-id-1225' size-in-bits='64'
> id='type-id-479'/>
>      <qualified-type-def type-id='type-id-1050' const='yes'
> id='type-id-1226'/>
>      <pointer-type-def type-id='type-id-1226' size-in-bits='64'
> id='type-id-1048'/>
> -    <qualified-type-def type-id='type-id-821' const='yes'
> id='type-id-1227'/>
> +    <qualified-type-def type-id='type-id-820' const='yes'
> id='type-id-1227'/>
>      <pointer-type-def type-id='type-id-1227' size-in-bits='64'
> id='type-id-1228'/>
>      <qualified-type-def type-id='type-id-82' const='yes'
> id='type-id-1229'/>
>      <pointer-type-def type-id='type-id-1229' size-in-bits='64'
> id='type-id-1230'/>
> @@ -9406,7 +9414,7 @@
>      <qualified-type-def type-id='type-id-361' const='yes'
> id='type-id-1241'/>
>      <pointer-type-def type-id='type-id-1241' size-in-bits='64'
> id='type-id-1242'/>
>      <qualified-type-def type-id='type-id-106' const='yes'
> id='type-id-1243'/>
> -    <pointer-type-def type-id='type-id-1243' size-in-bits='64'
> id='type-id-797'/>
> +    <pointer-type-def type-id='type-id-1243' size-in-bits='64'
> id='type-id-796'/>
>      <qualified-type-def type-id='type-id-380' const='yes'
> id='type-id-1244'/>
>      <pointer-type-def type-id='type-id-1244' size-in-bits='64'
> id='type-id-1245'/>
>      <qualified-type-def type-id='type-id-941' const='yes'
> id='type-id-1246'/>
> @@ -9416,32 +9424,32 @@
>      <qualified-type-def type-id='type-id-260' const='yes'
> id='type-id-1248'/>
>      <pointer-type-def type-id='type-id-1248' size-in-bits='64'
> id='type-id-480'/>
>      <qualified-type-def type-id='type-id-114' const='yes'
> id='type-id-1249'/>
> -    <pointer-type-def type-id='type-id-1249' size-in-bits='64'
> id='type-id-696'/>
> +    <pointer-type-def type-id='type-id-1249' size-in-bits='64'
> id='type-id-695'/>
>      <qualified-type-def type-id='type-id-244' const='yes'
> id='type-id-1250'/>
>      <pointer-type-def type-id='type-id-1250' size-in-bits='64'
> id='type-id-230'/>
>      <qualified-type-def type-id='type-id-560' const='yes'
> id='type-id-1251'/>
>      <pointer-type-def type-id='type-id-1251' size-in-bits='64'
> id='type-id-452'/>
>      <qualified-type-def type-id='type-id-342' const='yes'
> id='type-id-1252'/>
>      <pointer-type-def type-id='type-id-1252' size-in-bits='64'
> id='type-id-337'/>
> -    <qualified-type-def type-id='type-id-272' const='yes'
> id='type-id-514'/>
> +    <qualified-type-def type-id='type-id-275' const='yes'
> id='type-id-514'/>
>      <qualified-type-def type-id='type-id-208' const='yes'
> id='type-id-1253'/>
>      <pointer-type-def type-id='type-id-1253' size-in-bits='64'
> id='type-id-390'/>
>      <qualified-type-def type-id='type-id-210' const='yes'
> id='type-id-965'/>
>      <qualified-type-def type-id='type-id-211' const='yes'
> id='type-id-909'/>
> -    <qualified-type-def type-id='type-id-660' const='yes'
> id='type-id-1254'/>
> -    <pointer-type-def type-id='type-id-1254' size-in-bits='64'
> id='type-id-655'/>
> +    <qualified-type-def type-id='type-id-659' const='yes'
> id='type-id-1254'/>
> +    <pointer-type-def type-id='type-id-1254' size-in-bits='64'
> id='type-id-654'/>
>      <qualified-type-def type-id='type-id-136' const='yes'
> id='type-id-1255'/>
>      <pointer-type-def type-id='type-id-1255' size-in-bits='64'
> id='type-id-1256'/>
>      <pointer-type-def type-id='type-id-1256' size-in-bits='64'
> id='type-id-456'/>
> -    <pointer-type-def type-id='type-id-689' size-in-bits='64'
> id='type-id-648'/>
> -    <pointer-type-def type-id='type-id-690' size-in-bits='64'
> id='type-id-691'/>
> -    <pointer-type-def type-id='type-id-55' size-in-bits='64'
> id='type-id-735'/>
> +    <pointer-type-def type-id='type-id-688' size-in-bits='64'
> id='type-id-647'/>
> +    <pointer-type-def type-id='type-id-689' size-in-bits='64'
> id='type-id-690'/>
> +    <pointer-type-def type-id='type-id-55' size-in-bits='64'
> id='type-id-734'/>
>      <pointer-type-def type-id='type-id-437' size-in-bits='64'
> id='type-id-1257'/>
>      <pointer-type-def type-id='type-id-377' size-in-bits='64'
> id='type-id-295'/>
>      <pointer-type-def type-id='type-id-1258' size-in-bits='64'
> id='type-id-956'/>
>      <pointer-type-def type-id='type-id-1259' size-in-bits='64'
> id='type-id-471'/>
>      <pointer-type-def type-id='type-id-1260' size-in-bits='64'
> id='type-id-416'/>
> -    <pointer-type-def type-id='type-id-902' size-in-bits='64'
> id='type-id-604'/>
> +    <pointer-type-def type-id='type-id-902' size-in-bits='64'
> id='type-id-901'/>
>      <pointer-type-def type-id='type-id-56' size-in-bits='64'
> id='type-id-307'/>
>      <pointer-type-def type-id='type-id-1094' size-in-bits='64'
> id='type-id-305'/>
>      <pointer-type-def type-id='type-id-57' size-in-bits='64'
> id='type-id-1091'/>
> @@ -9458,7 +9466,7 @@
>      <pointer-type-def type-id='type-id-1263' size-in-bits='64'
> id='type-id-1265'/>
>      <pointer-type-def type-id='type-id-1266' size-in-bits='64'
> id='type-id-577'/>
>      <pointer-type-def type-id='type-id-60' size-in-bits='64'
> id='type-id-1078'/>
> -    <pointer-type-def type-id='type-id-1267' size-in-bits='64'
> id='type-id-762'/>
> +    <pointer-type-def type-id='type-id-1267' size-in-bits='64'
> id='type-id-761'/>
>      <pointer-type-def type-id='type-id-1268' size-in-bits='64'
> id='type-id-1174'/>
>      <pointer-type-def type-id='type-id-526' size-in-bits='64'
> id='type-id-482'/>
>      <pointer-type-def type-id='type-id-1000' size-in-bits='64'
> id='type-id-996'/>
> @@ -9469,13 +9477,13 @@
>      <pointer-type-def type-id='type-id-995' size-in-bits='64'
> id='type-id-1270'/>
>      <pointer-type-def type-id='type-id-1022' size-in-bits='64'
> id='type-id-404'/>
>      <pointer-type-def type-id='type-id-468' size-in-bits='64'
> id='type-id-451'/>
> -    <pointer-type-def type-id='type-id-62' size-in-bits='64'
> id='type-id-717'/>
> +    <pointer-type-def type-id='type-id-62' size-in-bits='64'
> id='type-id-716'/>
>      <pointer-type-def type-id='type-id-63' size-in-bits='64'
> id='type-id-1271'/>
> -    <pointer-type-def type-id='type-id-65' size-in-bits='64'
> id='type-id-716'/>
> +    <pointer-type-def type-id='type-id-65' size-in-bits='64'
> id='type-id-715'/>
>      <pointer-type-def type-id='type-id-66' size-in-bits='64'
> id='type-id-408'/>
>      <pointer-type-def type-id='type-id-68' size-in-bits='64'
> id='type-id-407'/>
> -    <pointer-type-def type-id='type-id-69' size-in-bits='64'
> id='type-id-742'/>
> -    <pointer-type-def type-id='type-id-70' size-in-bits='64'
> id='type-id-738'/>
> +    <pointer-type-def type-id='type-id-69' size-in-bits='64'
> id='type-id-741'/>
> +    <pointer-type-def type-id='type-id-70' size-in-bits='64'
> id='type-id-737'/>
>      <pointer-type-def type-id='type-id-1135' size-in-bits='64'
> id='type-id-1272'/>
>      <pointer-type-def type-id='type-id-1118' size-in-bits='64'
> id='type-id-315'/>
>      <pointer-type-def type-id='type-id-1273' size-in-bits='64'
> id='type-id-1129'/>
> @@ -9484,22 +9492,22 @@
>      <pointer-type-def type-id='type-id-1276' size-in-bits='64'
> id='type-id-1122'/>
>      <pointer-type-def type-id='type-id-1134' size-in-bits='64'
> id='type-id-1277'/>
>      <pointer-type-def type-id='type-id-71' size-in-bits='64'
> id='type-id-938'/>
> -    <pointer-type-def type-id='type-id-830' size-in-bits='64'
> id='type-id-801'/>
> +    <pointer-type-def type-id='type-id-829' size-in-bits='64'
> id='type-id-800'/>
>      <pointer-type-def type-id='type-id-72' size-in-bits='64'
> id='type-id-937'/>
>      <pointer-type-def type-id='type-id-379' size-in-bits='64'
> id='type-id-387'/>
>      <pointer-type-def type-id='type-id-387' size-in-bits='64'
> id='type-id-388'/>
>      <pointer-type-def type-id='type-id-144' size-in-bits='64'
> id='type-id-550'/>
>      <pointer-type-def type-id='type-id-550' size-in-bits='64'
> id='type-id-551'/>
> -    <pointer-type-def type-id='type-id-759' size-in-bits='64'
> id='type-id-767'/>
> -    <pointer-type-def type-id='type-id-146' size-in-bits='64'
> id='type-id-763'/>
> -    <pointer-type-def type-id='type-id-770' size-in-bits='64'
> id='type-id-765'/>
> +    <pointer-type-def type-id='type-id-758' size-in-bits='64'
> id='type-id-766'/>
> +    <pointer-type-def type-id='type-id-146' size-in-bits='64'
> id='type-id-762'/>
> +    <pointer-type-def type-id='type-id-769' size-in-bits='64'
> id='type-id-764'/>
>      <pointer-type-def type-id='type-id-440' size-in-bits='64'
> id='type-id-1278'/>
>      <pointer-type-def type-id='type-id-392' size-in-bits='64'
> id='type-id-148'/>
>      <pointer-type-def type-id='type-id-1279' size-in-bits='64'
> id='type-id-561'/>
>      <pointer-type-def type-id='type-id-1280' size-in-bits='64'
> id='type-id-483'/>
> -    <pointer-type-def type-id='type-id-1281' size-in-bits='64'
> id='type-id-629'/>
> -    <pointer-type-def type-id='type-id-1282' size-in-bits='64'
> id='type-id-625'/>
> -    <pointer-type-def type-id='type-id-1283' size-in-bits='64'
> id='type-id-615'/>
> +    <pointer-type-def type-id='type-id-1281' size-in-bits='64'
> id='type-id-623'/>
> +    <pointer-type-def type-id='type-id-1282' size-in-bits='64'
> id='type-id-619'/>
> +    <pointer-type-def type-id='type-id-1283' size-in-bits='64'
> id='type-id-609'/>
>      <pointer-type-def type-id='type-id-1284' size-in-bits='64'
> id='type-id-519'/>
>      <pointer-type-def type-id='type-id-1285' size-in-bits='64'
> id='type-id-518'/>
>      <pointer-type-def type-id='type-id-1286' size-in-bits='64'
> id='type-id-949'/>
> @@ -9527,14 +9535,14 @@
>      <pointer-type-def type-id='type-id-1308' size-in-bits='64'
> id='type-id-1099'/>
>      <pointer-type-def type-id='type-id-1309' size-in-bits='64'
> id='type-id-991'/>
>      <pointer-type-def type-id='type-id-1310' size-in-bits='64'
> id='type-id-919'/>
> -    <pointer-type-def type-id='type-id-1311' size-in-bits='64'
> id='type-id-617'/>
> -    <pointer-type-def type-id='type-id-1312' size-in-bits='64'
> id='type-id-618'/>
> -    <pointer-type-def type-id='type-id-1313' size-in-bits='64'
> id='type-id-619'/>
> +    <pointer-type-def type-id='type-id-1311' size-in-bits='64'
> id='type-id-611'/>
> +    <pointer-type-def type-id='type-id-1312' size-in-bits='64'
> id='type-id-612'/>
> +    <pointer-type-def type-id='type-id-1313' size-in-bits='64'
> id='type-id-613'/>
>      <pointer-type-def type-id='type-id-1314' size-in-bits='64'
> id='type-id-971'/>
>      <pointer-type-def type-id='type-id-1315' size-in-bits='64'
> id='type-id-979'/>
>      <pointer-type-def type-id='type-id-1316' size-in-bits='64'
> id='type-id-358'/>
>      <pointer-type-def type-id='type-id-1317' size-in-bits='64'
> id='type-id-984'/>
> -    <pointer-type-def type-id='type-id-1318' size-in-bits='64'
> id='type-id-614'/>
> +    <pointer-type-def type-id='type-id-1318' size-in-bits='64'
> id='type-id-608'/>
>      <pointer-type-def type-id='type-id-1319' size-in-bits='64'
> id='type-id-976'/>
>      <pointer-type-def type-id='type-id-1320' size-in-bits='64'
> id='type-id-977'/>
>      <pointer-type-def type-id='type-id-1321' size-in-bits='64'
> id='type-id-974'/>
> @@ -9564,7 +9572,7 @@
>      <pointer-type-def type-id='type-id-1345' size-in-bits='64'
> id='type-id-1046'/>
>      <pointer-type-def type-id='type-id-1346' size-in-bits='64'
> id='type-id-1051'/>
>      <pointer-type-def type-id='type-id-1347' size-in-bits='64'
> id='type-id-1059'/>
> -    <pointer-type-def type-id='type-id-1348' size-in-bits='64'
> id='type-id-827'/>
> +    <pointer-type-def type-id='type-id-1348' size-in-bits='64'
> id='type-id-826'/>
>      <pointer-type-def type-id='type-id-1349' size-in-bits='64'
> id='type-id-970'/>
>      <pointer-type-def type-id='type-id-1350' size-in-bits='64'
> id='type-id-1351'/>
>      <qualified-type-def type-id='type-id-1351' const='yes'
> id='type-id-331'/>
> @@ -9583,10 +9591,10 @@
>      <pointer-type-def type-id='type-id-1364' size-in-bits='64'
> id='type-id-1152'/>
>      <pointer-type-def type-id='type-id-1365' size-in-bits='64'
> id='type-id-505'/>
>      <pointer-type-def type-id='type-id-1366' size-in-bits='64'
> id='type-id-1167'/>
> -    <pointer-type-def type-id='type-id-1367' size-in-bits='64'
> id='type-id-616'/>
> -    <pointer-type-def type-id='type-id-1368' size-in-bits='64'
> id='type-id-622'/>
> -    <pointer-type-def type-id='type-id-1369' size-in-bits='64'
> id='type-id-627'/>
> -    <pointer-type-def type-id='type-id-1370' size-in-bits='64'
> id='type-id-613'/>
> +    <pointer-type-def type-id='type-id-1367' size-in-bits='64'
> id='type-id-610'/>
> +    <pointer-type-def type-id='type-id-1368' size-in-bits='64'
> id='type-id-616'/>
> +    <pointer-type-def type-id='type-id-1369' size-in-bits='64'
> id='type-id-621'/>
> +    <pointer-type-def type-id='type-id-1370' size-in-bits='64'
> id='type-id-607'/>
>      <pointer-type-def type-id='type-id-1371' size-in-bits='64'
> id='type-id-248'/>
>      <pointer-type-def type-id='type-id-1372' size-in-bits='64'
> id='type-id-253'/>
>      <pointer-type-def type-id='type-id-1373' size-in-bits='64'
> id='type-id-573'/>
> @@ -9604,39 +9612,39 @@
>      <pointer-type-def type-id='type-id-1385' size-in-bits='64'
> id='type-id-578'/>
>      <pointer-type-def type-id='type-id-1386' size-in-bits='64'
> id='type-id-932'/>
>      <pointer-type-def type-id='type-id-1387' size-in-bits='64'
> id='type-id-928'/>
> -    <pointer-type-def type-id='type-id-1388' size-in-bits='64'
> id='type-id-630'/>
> +    <pointer-type-def type-id='type-id-1388' size-in-bits='64'
> id='type-id-624'/>
>      <pointer-type-def type-id='type-id-1389' size-in-bits='64'
> id='type-id-430'/>
>      <pointer-type-def type-id='type-id-1390' size-in-bits='64'
> id='type-id-419'/>
>      <pointer-type-def type-id='type-id-1391' size-in-bits='64'
> id='type-id-574'/>
> -    <pointer-type-def type-id='type-id-1392' size-in-bits='64'
> id='type-id-663'/>
> -    <pointer-type-def type-id='type-id-1393' size-in-bits='64'
> id='type-id-662'/>
> -    <pointer-type-def type-id='type-id-1394' size-in-bits='64'
> id='type-id-668'/>
> -    <pointer-type-def type-id='type-id-150' size-in-bits='64'
> id='type-id-711'/>
> -    <pointer-type-def type-id='type-id-859' size-in-bits='64'
> id='type-id-730'/>
> -    <pointer-type-def type-id='type-id-861' size-in-bits='64'
> id='type-id-860'/>
> +    <pointer-type-def type-id='type-id-1392' size-in-bits='64'
> id='type-id-662'/>
> +    <pointer-type-def type-id='type-id-1393' size-in-bits='64'
> id='type-id-661'/>
> +    <pointer-type-def type-id='type-id-1394' size-in-bits='64'
> id='type-id-667'/>
> +    <pointer-type-def type-id='type-id-150' size-in-bits='64'
> id='type-id-710'/>
> +    <pointer-type-def type-id='type-id-858' size-in-bits='64'
> id='type-id-729'/>
> +    <pointer-type-def type-id='type-id-860' size-in-bits='64'
> id='type-id-859'/>
>      <pointer-type-def type-id='type-id-73' size-in-bits='64'
> id='type-id-321'/>
>      <pointer-type-def type-id='type-id-74' size-in-bits='64'
> id='type-id-320'/>
>      <pointer-type-def type-id='type-id-76' size-in-bits='64'
> id='type-id-322'/>
>      <pointer-type-def type-id='type-id-77' size-in-bits='64'
> id='type-id-1395'/>
> -    <pointer-type-def type-id='type-id-78' size-in-bits='64'
> id='type-id-833'/>
> +    <pointer-type-def type-id='type-id-78' size-in-bits='64'
> id='type-id-832'/>
>      <pointer-type-def type-id='type-id-79' size-in-bits='64'
> id='type-id-306'/>
>      <pointer-type-def type-id='type-id-512' size-in-bits='64'
> id='type-id-481'/>
> -    <pointer-type-def type-id='type-id-865' size-in-bits='64'
> id='type-id-732'/>
> +    <pointer-type-def type-id='type-id-864' size-in-bits='64'
> id='type-id-731'/>
>      <pointer-type-def type-id='type-id-80' size-in-bits='64'
> id='type-id-1035'/>
>      <pointer-type-def type-id='type-id-1032' size-in-bits='64'
> id='type-id-326'/>
>      <pointer-type-def type-id='type-id-1060' size-in-bits='64'
> id='type-id-1396'/>
>      <pointer-type-def type-id='type-id-81' size-in-bits='64'
> id='type-id-1049'/>
>      <pointer-type-def type-id='type-id-1040' size-in-bits='64'
> id='type-id-1039'/>
>      <pointer-type-def type-id='type-id-1042' size-in-bits='64'
> id='type-id-1041'/>
> -    <pointer-type-def type-id='type-id-804' size-in-bits='64'
> id='type-id-714'/>
> -    <pointer-type-def type-id='type-id-825' size-in-bits='64'
> id='type-id-812'/>
> -    <pointer-type-def type-id='type-id-820' size-in-bits='64'
> id='type-id-818'/>
> -    <pointer-type-def type-id='type-id-82' size-in-bits='64'
> id='type-id-817'/>
> -    <pointer-type-def type-id='type-id-83' size-in-bits='64'
> id='type-id-807'/>
> +    <pointer-type-def type-id='type-id-803' size-in-bits='64'
> id='type-id-713'/>
> +    <pointer-type-def type-id='type-id-824' size-in-bits='64'
> id='type-id-811'/>
> +    <pointer-type-def type-id='type-id-819' size-in-bits='64'
> id='type-id-817'/>
> +    <pointer-type-def type-id='type-id-82' size-in-bits='64'
> id='type-id-816'/>
> +    <pointer-type-def type-id='type-id-83' size-in-bits='64'
> id='type-id-806'/>
>      <pointer-type-def type-id='type-id-155' size-in-bits='64'
> id='type-id-1397'/>
> -    <pointer-type-def type-id='type-id-633' size-in-bits='64'
> id='type-id-1398'/>
> -    <pointer-type-def type-id='type-id-84' size-in-bits='64'
> id='type-id-649'/>
> -    <pointer-type-def type-id='type-id-85' size-in-bits='64'
> id='type-id-596'/>
> +    <pointer-type-def type-id='type-id-627' size-in-bits='64'
> id='type-id-1398'/>
> +    <pointer-type-def type-id='type-id-84' size-in-bits='64'
> id='type-id-648'/>
> +    <pointer-type-def type-id='type-id-85' size-in-bits='64'
> id='type-id-632'/>
>      <pointer-type-def type-id='type-id-335' size-in-bits='64'
> id='type-id-325'/>
>      <pointer-type-def type-id='type-id-334' size-in-bits='64'
> id='type-id-1399'/>
>      <pointer-type-def type-id='type-id-297' size-in-bits='64'
> id='type-id-323'/>
> @@ -9649,7 +9657,7 @@
>      <pointer-type-def type-id='type-id-233' size-in-bits='64'
> id='type-id-1405'/>
>      <pointer-type-def type-id='type-id-1177' size-in-bits='64'
> id='type-id-1406'/>
>      <pointer-type-def type-id='type-id-1168' size-in-bits='64'
> id='type-id-293'/>
> -    <pointer-type-def type-id='type-id-87' size-in-bits='64'
> id='type-id-646'/>
> +    <pointer-type-def type-id='type-id-87' size-in-bits='64'
> id='type-id-645'/>
>      <pointer-type-def type-id='type-id-158' size-in-bits='64'
> id='type-id-277'/>
>      <pointer-type-def type-id='type-id-964' size-in-bits='64'
> id='type-id-963'/>
>      <pointer-type-def type-id='type-id-961' size-in-bits='64'
> id='type-id-960'/>
> @@ -9658,10 +9666,10 @@
>      <pointer-type-def type-id='type-id-365' size-in-bits='64'
> id='type-id-1407'/>
>      <pointer-type-def type-id='type-id-1408' size-in-bits='64'
> id='type-id-985'/>
>      <pointer-type-def type-id='type-id-1409' size-in-bits='64'
> id='type-id-973'/>
> -    <pointer-type-def type-id='type-id-1410' size-in-bits='64'
> id='type-id-775'/>
> +    <pointer-type-def type-id='type-id-1410' size-in-bits='64'
> id='type-id-774'/>
>      <pointer-type-def type-id='type-id-1411' size-in-bits='64'
> id='type-id-579'/>
>      <pointer-type-def type-id='type-id-88' size-in-bits='64'
> id='type-id-592'/>
> -    <pointer-type-def type-id='type-id-641' size-in-bits='64'
> id='type-id-640'/>
> +    <pointer-type-def type-id='type-id-640' size-in-bits='64'
> id='type-id-639'/>
>      <pointer-type-def type-id='type-id-1155' size-in-bits='64'
> id='type-id-286'/>
>      <pointer-type-def type-id='type-id-257' size-in-bits='64'
> id='type-id-236'/>
>      <pointer-type-def type-id='type-id-288' size-in-bits='64'
> id='type-id-287'/>
> @@ -9670,7 +9678,7 @@
>      <pointer-type-def type-id='type-id-285' size-in-bits='64'
> id='type-id-1412'/>
>      <pointer-type-def type-id='type-id-90' size-in-bits='64'
> id='type-id-282'/>
>      <pointer-type-def type-id='type-id-261' size-in-bits='64'
> id='type-id-172'/>
> -    <pointer-type-def type-id='type-id-91' size-in-bits='64'
> id='type-id-834'/>
> +    <pointer-type-def type-id='type-id-91' size-in-bits='64'
> id='type-id-833'/>
>      <pointer-type-def type-id='type-id-488' size-in-bits='64'
> id='type-id-487'/>
>      <pointer-type-def type-id='type-id-475' size-in-bits='64'
> id='type-id-474'/>
>      <pointer-type-def type-id='type-id-501' size-in-bits='64'
> id='type-id-478'/>
> @@ -9679,35 +9687,35 @@
>      <pointer-type-def type-id='type-id-93' size-in-bits='64'
> id='type-id-499'/>
>      <pointer-type-def type-id='type-id-94' size-in-bits='64'
> id='type-id-489'/>
>      <pointer-type-def type-id='type-id-95' size-in-bits='64'
> id='type-id-461'/>
> -    <pointer-type-def type-id='type-id-96' size-in-bits='64'
> id='type-id-715'/>
> -    <pointer-type-def type-id='type-id-97' size-in-bits='64'
> id='type-id-835'/>
> +    <pointer-type-def type-id='type-id-96' size-in-bits='64'
> id='type-id-714'/>
> +    <pointer-type-def type-id='type-id-97' size-in-bits='64'
> id='type-id-834'/>
>      <pointer-type-def type-id='type-id-98' size-in-bits='64'
> id='type-id-1021'/>
>      <pointer-type-def type-id='type-id-99' size-in-bits='64'
> id='type-id-1020'/>
>      <pointer-type-def type-id='type-id-283' size-in-bits='64'
> id='type-id-1166'/>
> -    <pointer-type-def type-id='type-id-831' size-in-bits='64'
> id='type-id-718'/>
> -    <pointer-type-def type-id='type-id-787' size-in-bits='64'
> id='type-id-784'/>
> -    <pointer-type-def type-id='type-id-589' size-in-bits='64'
> id='type-id-638'/>
> -    <pointer-type-def type-id='type-id-1414' size-in-bits='64'
> id='type-id-670'/>
> -    <pointer-type-def type-id='type-id-638' size-in-bits='64'
> id='type-id-893'/>
> +    <pointer-type-def type-id='type-id-830' size-in-bits='64'
> id='type-id-717'/>
> +    <pointer-type-def type-id='type-id-786' size-in-bits='64'
> id='type-id-783'/>
> +    <pointer-type-def type-id='type-id-589' size-in-bits='64'
> id='type-id-635'/>
> +    <pointer-type-def type-id='type-id-1414' size-in-bits='64'
> id='type-id-669'/>
> +    <pointer-type-def type-id='type-id-635' size-in-bits='64'
> id='type-id-892'/>
>      <pointer-type-def type-id='type-id-361' size-in-bits='64'
> id='type-id-1415'/>
>      <pointer-type-def type-id='type-id-906' size-in-bits='64'
> id='type-id-905'/>
>      <pointer-type-def type-id='type-id-914' size-in-bits='64'
> id='type-id-912'/>
>      <pointer-type-def type-id='type-id-100' size-in-bits='64'
> id='type-id-176'/>
>      <pointer-type-def type-id='type-id-101' size-in-bits='64'
> id='type-id-178'/>
> -    <pointer-type-def type-id='type-id-683' size-in-bits='64'
> id='type-id-644'/>
> -    <pointer-type-def type-id='type-id-791' size-in-bits='64'
> id='type-id-180'/>
> -    <pointer-type-def type-id='type-id-793' size-in-bits='64'
> id='type-id-792'/>
> -    <pointer-type-def type-id='type-id-102' size-in-bits='64'
> id='type-id-740'/>
> +    <pointer-type-def type-id='type-id-682' size-in-bits='64'
> id='type-id-643'/>
> +    <pointer-type-def type-id='type-id-790' size-in-bits='64'
> id='type-id-180'/>
> +    <pointer-type-def type-id='type-id-792' size-in-bits='64'
> id='type-id-791'/>
> +    <pointer-type-def type-id='type-id-102' size-in-bits='64'
> id='type-id-739'/>
>      <pointer-type-def type-id='type-id-532' size-in-bits='64'
> id='type-id-531'/>
>      <pointer-type-def type-id='type-id-1093' size-in-bits='64'
> id='type-id-1089'/>
> -    <pointer-type-def type-id='type-id-679' size-in-bits='64'
> id='type-id-673'/>
> +    <pointer-type-def type-id='type-id-678' size-in-bits='64'
> id='type-id-672'/>
>      <pointer-type-def type-id='type-id-103' size-in-bits='64'
> id='type-id-1416'/>
> -    <pointer-type-def type-id='type-id-104' size-in-bits='64'
> id='type-id-789'/>
> +    <pointer-type-def type-id='type-id-104' size-in-bits='64'
> id='type-id-788'/>
>      <pointer-type-def type-id='type-id-105' size-in-bits='64'
> id='type-id-394'/>
>      <pointer-type-def type-id='type-id-1417' size-in-bits='64'
> id='type-id-420'/>
>      <pointer-type-def type-id='type-id-1137' size-in-bits='64'
> id='type-id-1119'/>
> -    <pointer-type-def type-id='type-id-675' size-in-bits='64'
> id='type-id-676'/>
> -    <pointer-type-def type-id='type-id-682' size-in-bits='64'
> id='type-id-674'/>
> +    <pointer-type-def type-id='type-id-674' size-in-bits='64'
> id='type-id-675'/>
> +    <pointer-type-def type-id='type-id-681' size-in-bits='64'
> id='type-id-673'/>
>      <pointer-type-def type-id='type-id-934' size-in-bits='64'
> id='type-id-1418'/>
>      <pointer-type-def type-id='type-id-933' size-in-bits='64'
> id='type-id-1419'/>
>      <pointer-type-def type-id='type-id-935' size-in-bits='64'
> id='type-id-1420'/>
> @@ -9716,32 +9724,32 @@
>      <pointer-type-def type-id='type-id-380' size-in-bits='64'
> id='type-id-1423'/>
>      <pointer-type-def type-id='type-id-940' size-in-bits='64'
> id='type-id-939'/>
>      <pointer-type-def type-id='type-id-184' size-in-bits='64'
> id='type-id-529'/>
> -    <pointer-type-def type-id='type-id-107' size-in-bits='64'
> id='type-id-704'/>
> -    <pointer-type-def type-id='type-id-108' size-in-bits='64'
> id='type-id-729'/>
> +    <pointer-type-def type-id='type-id-107' size-in-bits='64'
> id='type-id-703'/>
> +    <pointer-type-def type-id='type-id-108' size-in-bits='64'
> id='type-id-728'/>
>      <pointer-type-def type-id='type-id-109' size-in-bits='64'
> id='type-id-1178'/>
> -    <pointer-type-def type-id='type-id-110' size-in-bits='64'
> id='type-id-743'/>
> +    <pointer-type-def type-id='type-id-110' size-in-bits='64'
> id='type-id-742'/>
>      <pointer-type-def type-id='type-id-904' size-in-bits='64'
> id='type-id-911'/>
> -    <pointer-type-def type-id='type-id-709' size-in-bits='64'
> id='type-id-1424'/>
> -    <pointer-type-def type-id='type-id-891' size-in-bits='64'
> id='type-id-887'/>
> -    <pointer-type-def type-id='type-id-111' size-in-bits='64'
> id='type-id-736'/>
> -    <pointer-type-def type-id='type-id-112' size-in-bits='64'
> id='type-id-726'/>
> -    <pointer-type-def type-id='type-id-113' size-in-bits='64'
> id='type-id-758'/>
> +    <pointer-type-def type-id='type-id-708' size-in-bits='64'
> id='type-id-1424'/>
> +    <pointer-type-def type-id='type-id-890' size-in-bits='64'
> id='type-id-886'/>
> +    <pointer-type-def type-id='type-id-111' size-in-bits='64'
> id='type-id-735'/>
> +    <pointer-type-def type-id='type-id-112' size-in-bits='64'
> id='type-id-725'/>
> +    <pointer-type-def type-id='type-id-113' size-in-bits='64'
> id='type-id-757'/>
>      <pointer-type-def type-id='type-id-1113' size-in-bits='64'
> id='type-id-259'/>
> -    <pointer-type-def type-id='type-id-697' size-in-bits='64'
> id='type-id-753'/>
> -    <pointer-type-def type-id='type-id-698' size-in-bits='64'
> id='type-id-757'/>
> +    <pointer-type-def type-id='type-id-696' size-in-bits='64'
> id='type-id-752'/>
> +    <pointer-type-def type-id='type-id-697' size-in-bits='64'
> id='type-id-756'/>
>      <pointer-type-def type-id='type-id-227' size-in-bits='64'
> id='type-id-1425'/>
>      <pointer-type-def type-id='type-id-115' size-in-bits='64'
> id='type-id-188'/>
>      <pointer-type-def type-id='type-id-116' size-in-bits='64'
> id='type-id-1164'/>
> -    <pointer-type-def type-id='type-id-117' size-in-bits='64'
> id='type-id-857'/>
> -    <pointer-type-def type-id='type-id-632' size-in-bits='64'
> id='type-id-1426'/>
> +    <pointer-type-def type-id='type-id-117' size-in-bits='64'
> id='type-id-856'/>
> +    <pointer-type-def type-id='type-id-626' size-in-bits='64'
> id='type-id-1426'/>
>      <pointer-type-def type-id='type-id-118' size-in-bits='64'
> id='type-id-1061'/>
>      <pointer-type-def type-id='type-id-1112' size-in-bits='64'
> id='type-id-1427'/>
>      <pointer-type-def type-id='type-id-917' size-in-bits='64'
> id='type-id-1428'/>
>      <pointer-type-def type-id='type-id-465' size-in-bits='64'
> id='type-id-1429'/>
> -    <pointer-type-def type-id='type-id-847' size-in-bits='64'
> id='type-id-720'/>
> -    <pointer-type-def type-id='type-id-837' size-in-bits='64'
> id='type-id-719'/>
> +    <pointer-type-def type-id='type-id-846' size-in-bits='64'
> id='type-id-719'/>
> +    <pointer-type-def type-id='type-id-836' size-in-bits='64'
> id='type-id-718'/>
>      <pointer-type-def type-id='type-id-119' size-in-bits='64'
> id='type-id-1430'/>
> -    <pointer-type-def type-id='type-id-234' size-in-bits='64'
> id='type-id-677'/>
> +    <pointer-type-def type-id='type-id-234' size-in-bits='64'
> id='type-id-676'/>
>      <pointer-type-def type-id='type-id-546' size-in-bits='64'
> id='type-id-545'/>
>      <pointer-type-def type-id='type-id-194' size-in-bits='64'
> id='type-id-192'/>
>      <pointer-type-def type-id='type-id-544' size-in-bits='64'
> id='type-id-548'/>
> @@ -9749,11 +9757,11 @@
>      <pointer-type-def type-id='type-id-120' size-in-bits='64'
> id='type-id-1073'/>
>      <pointer-type-def type-id='type-id-450' size-in-bits='64'
> id='type-id-383'/>
>      <pointer-type-def type-id='type-id-121' size-in-bits='64'
> id='type-id-1431'/>
> -    <pointer-type-def type-id='type-id-122' size-in-bits='64'
> id='type-id-699'/>
> -    <pointer-type-def type-id='type-id-692' size-in-bits='64'
> id='type-id-292'/>
> -    <pointer-type-def type-id='type-id-123' size-in-bits='64'
> id='type-id-842'/>
> +    <pointer-type-def type-id='type-id-122' size-in-bits='64'
> id='type-id-698'/>
> +    <pointer-type-def type-id='type-id-691' size-in-bits='64'
> id='type-id-292'/>
> +    <pointer-type-def type-id='type-id-123' size-in-bits='64'
> id='type-id-841'/>
>      <pointer-type-def type-id='type-id-242' size-in-bits='64'
> id='type-id-1432'/>
> -    <pointer-type-def type-id='type-id-760' size-in-bits='64'
> id='type-id-772'/>
> +    <pointer-type-def type-id='type-id-759' size-in-bits='64'
> id='type-id-771'/>
>      <pointer-type-def type-id='type-id-397' size-in-bits='64'
> id='type-id-1433'/>
>      <pointer-type-def type-id='type-id-124' size-in-bits='64'
> id='type-id-1434'/>
>      <pointer-type-def type-id='type-id-1434' size-in-bits='64'
> id='type-id-496'/>
> @@ -9762,8 +9770,8 @@
>      <pointer-type-def type-id='type-id-556' size-in-bits='64'
> id='type-id-555'/>
>      <pointer-type-def type-id='type-id-559' size-in-bits='64'
> id='type-id-558'/>
>      <pointer-type-def type-id='type-id-543' size-in-bits='64'
> id='type-id-491'/>
> -    <pointer-type-def type-id='type-id-126' size-in-bits='64'
> id='type-id-843'/>
> -    <pointer-type-def type-id='type-id-127' size-in-bits='64'
> id='type-id-839'/>
> +    <pointer-type-def type-id='type-id-126' size-in-bits='64'
> id='type-id-842'/>
> +    <pointer-type-def type-id='type-id-127' size-in-bits='64'
> id='type-id-838'/>
>      <pointer-type-def type-id='type-id-1436' size-in-bits='64'
> id='type-id-972'/>
>      <pointer-type-def type-id='type-id-1437' size-in-bits='64'
> id='type-id-1058'/>
>      <pointer-type-def type-id='type-id-1438' size-in-bits='64'
> id='type-id-1030'/>
> @@ -9771,14 +9779,14 @@
>      <pointer-type-def type-id='type-id-1440' size-in-bits='64'
> id='type-id-1126'/>
>      <pointer-type-def type-id='type-id-1441' size-in-bits='64'
> id='type-id-1014'/>
>      <pointer-type-def type-id='type-id-1442' size-in-bits='64'
> id='type-id-1182'/>
> -    <pointer-type-def type-id='type-id-1443' size-in-bits='64'
> id='type-id-626'/>
> +    <pointer-type-def type-id='type-id-1443' size-in-bits='64'
> id='type-id-620'/>
>      <pointer-type-def type-id='type-id-1444' size-in-bits='64'
> id='type-id-1101'/>
>      <pointer-type-def type-id='type-id-1445' size-in-bits='64'
> id='type-id-1105'/>
>      <pointer-type-def type-id='type-id-1446' size-in-bits='64'
> id='type-id-1011'/>
> -    <pointer-type-def type-id='type-id-1447' size-in-bits='64'
> id='type-id-769'/>
> +    <pointer-type-def type-id='type-id-1447' size-in-bits='64'
> id='type-id-768'/>
>      <pointer-type-def type-id='type-id-1448' size-in-bits='64'
> id='type-id-988'/>
>      <pointer-type-def type-id='type-id-1449' size-in-bits='64'
> id='type-id-967'/>
> -    <pointer-type-def type-id='type-id-1450' size-in-bits='64'
> id='type-id-620'/>
> +    <pointer-type-def type-id='type-id-1450' size-in-bits='64'
> id='type-id-614'/>
>      <pointer-type-def type-id='type-id-1451' size-in-bits='64'
> id='type-id-1111'/>
>      <pointer-type-def type-id='type-id-1452' size-in-bits='64'
> id='type-id-432'/>
>      <pointer-type-def type-id='type-id-1453' size-in-bits='64'
> id='type-id-968'/>
> @@ -9788,7 +9796,7 @@
>      <pointer-type-def type-id='type-id-1457' size-in-bits='64'
> id='type-id-980'/>
>      <pointer-type-def type-id='type-id-1458' size-in-bits='64'
> id='type-id-987'/>
>      <pointer-type-def type-id='type-id-1459' size-in-bits='64'
> id='type-id-1057'/>
> -    <pointer-type-def type-id='type-id-1460' size-in-bits='64'
> id='type-id-624'/>
> +    <pointer-type-def type-id='type-id-1460' size-in-bits='64'
> id='type-id-618'/>
>      <pointer-type-def type-id='type-id-1461' size-in-bits='64'
> id='type-id-343'/>
>      <pointer-type-def type-id='type-id-1462' size-in-bits='64'
> id='type-id-344'/>
>      <pointer-type-def type-id='type-id-1463' size-in-bits='64'
> id='type-id-502'/>
> @@ -9800,30 +9808,30 @@
>      <pointer-type-def type-id='type-id-1469' size-in-bits='64'
> id='type-id-1110'/>
>      <pointer-type-def type-id='type-id-1470' size-in-bits='64'
> id='type-id-353'/>
>      <pointer-type-def type-id='type-id-1471' size-in-bits='64'
> id='type-id-354'/>
> -    <pointer-type-def type-id='type-id-1472' size-in-bits='64'
> id='type-id-664'/>
> -    <pointer-type-def type-id='type-id-1473' size-in-bits='64'
> id='type-id-665'/>
> -    <pointer-type-def type-id='type-id-272' size-in-bits='64'
> id='type-id-1474'/>
> -    <pointer-type-def type-id='type-id-197' size-in-bits='64'
> id='type-id-780'/>
> +    <pointer-type-def type-id='type-id-1472' size-in-bits='64'
> id='type-id-663'/>
> +    <pointer-type-def type-id='type-id-1473' size-in-bits='64'
> id='type-id-664'/>
> +    <pointer-type-def type-id='type-id-275' size-in-bits='64'
> id='type-id-1474'/>
> +    <pointer-type-def type-id='type-id-197' size-in-bits='64'
> id='type-id-779'/>
>      <pointer-type-def type-id='type-id-201' size-in-bits='64'
> id='type-id-309'/>
> -    <pointer-type-def type-id='type-id-128' size-in-bits='64'
> id='type-id-795'/>
> +    <pointer-type-def type-id='type-id-128' size-in-bits='64'
> id='type-id-794'/>
>      <pointer-type-def type-id='type-id-349' size-in-bits='64'
> id='type-id-1475'/>
>      <pointer-type-def type-id='type-id-1476' size-in-bits='64'
> id='type-id-249'/>
>      <pointer-type-def type-id='type-id-210' size-in-bits='64'
> id='type-id-525'/>
> -    <pointer-type-def type-id='type-id-1477' size-in-bits='64'
> id='type-id-643'/>
> +    <pointer-type-def type-id='type-id-1477' size-in-bits='64'
> id='type-id-642'/>
>      <pointer-type-def type-id='type-id-1478' size-in-bits='64'
> id='type-id-958'/>
> -    <pointer-type-def type-id='type-id-1479' size-in-bits='64'
> id='type-id-667'/>
> +    <pointer-type-def type-id='type-id-1479' size-in-bits='64'
> id='type-id-666'/>
>      <pointer-type-def type-id='type-id-211' size-in-bits='64'
> id='type-id-497'/>
> -    <pointer-type-def type-id='type-id-129' size-in-bits='64'
> id='type-id-886'/>
> -    <pointer-type-def type-id='type-id-883' size-in-bits='64'
> id='type-id-744'/>
> +    <pointer-type-def type-id='type-id-129' size-in-bits='64'
> id='type-id-885'/>
> +    <pointer-type-def type-id='type-id-882' size-in-bits='64'
> id='type-id-743'/>
>      <pointer-type-def type-id='type-id-130' size-in-bits='64'
> id='type-id-466'/>
> -    <pointer-type-def type-id='type-id-828' size-in-bits='64'
> id='type-id-800'/>
> -    <pointer-type-def type-id='type-id-131' size-in-bits='64'
> id='type-id-832'/>
> +    <pointer-type-def type-id='type-id-827' size-in-bits='64'
> id='type-id-799'/>
> +    <pointer-type-def type-id='type-id-131' size-in-bits='64'
> id='type-id-831'/>
>      <pointer-type-def type-id='type-id-132' size-in-bits='64'
> id='type-id-376'/>
>      <pointer-type-def type-id='type-id-1480' size-in-bits='64'
> id='type-id-954'/>
> -    <pointer-type-def type-id='type-id-651' size-in-bits='64'
> id='type-id-222'/>
> -    <pointer-type-def type-id='type-id-672' size-in-bits='64'
> id='type-id-1481'/>
> -    <pointer-type-def type-id='type-id-892' size-in-bits='64'
> id='type-id-745'/>
> -    <pointer-type-def type-id='type-id-855' size-in-bits='64'
> id='type-id-498'/>
> +    <pointer-type-def type-id='type-id-650' size-in-bits='64'
> id='type-id-222'/>
> +    <pointer-type-def type-id='type-id-671' size-in-bits='64'
> id='type-id-1481'/>
> +    <pointer-type-def type-id='type-id-891' size-in-bits='64'
> id='type-id-744'/>
> +    <pointer-type-def type-id='type-id-854' size-in-bits='64'
> id='type-id-498'/>
>      <pointer-type-def type-id='type-id-1482' size-in-bits='64'
> id='type-id-375'/>
>      <pointer-type-def type-id='type-id-1483' size-in-bits='64'
> id='type-id-1140'/>
>      <pointer-type-def type-id='type-id-1484' size-in-bits='64'
> id='type-id-957'/>
> @@ -9841,7 +9849,7 @@
>      <pointer-type-def type-id='type-id-1496' size-in-bits='64'
> id='type-id-1098'/>
>      <pointer-type-def type-id='type-id-1497' size-in-bits='64'
> id='type-id-1108'/>
>      <pointer-type-def type-id='type-id-1498' size-in-bits='64'
> id='type-id-921'/>
> -    <pointer-type-def type-id='type-id-1499' size-in-bits='64'
> id='type-id-631'/>
> +    <pointer-type-def type-id='type-id-1499' size-in-bits='64'
> id='type-id-625'/>
>      <pointer-type-def type-id='type-id-1500' size-in-bits='64'
> id='type-id-1009'/>
>      <pointer-type-def type-id='type-id-1501' size-in-bits='64'
> id='type-id-1008'/>
>      <pointer-type-def type-id='type-id-1502' size-in-bits='64'
> id='type-id-1016'/>
> @@ -9849,7 +9857,7 @@
>      <pointer-type-def type-id='type-id-1504' size-in-bits='64'
> id='type-id-562'/>
>      <pointer-type-def type-id='type-id-1505' size-in-bits='64'
> id='type-id-563'/>
>      <pointer-type-def type-id='type-id-1506' size-in-bits='64'
> id='type-id-1052'/>
> -    <pointer-type-def type-id='type-id-1507' size-in-bits='64'
> id='type-id-634'/>
> +    <pointer-type-def type-id='type-id-1507' size-in-bits='64'
> id='type-id-628'/>
>      <pointer-type-def type-id='type-id-1508' size-in-bits='64'
> id='type-id-336'/>
>      <pointer-type-def type-id='type-id-1509' size-in-bits='64'
> id='type-id-341'/>
>      <pointer-type-def type-id='type-id-1510' size-in-bits='64'
> id='type-id-1170'/>
> @@ -9863,9 +9871,9 @@
>      <pointer-type-def type-id='type-id-1518' size-in-bits='64'
> id='type-id-263'/>
>      <pointer-type-def type-id='type-id-1519' size-in-bits='64'
> id='type-id-506'/>
>      <pointer-type-def type-id='type-id-1520' size-in-bits='64'
> id='type-id-504'/>
> -    <pointer-type-def type-id='type-id-1521' size-in-bits='64'
> id='type-id-623'/>
> -    <pointer-type-def type-id='type-id-1522' size-in-bits='64'
> id='type-id-628'/>
> -    <pointer-type-def type-id='type-id-1523' size-in-bits='64'
> id='type-id-621'/>
> +    <pointer-type-def type-id='type-id-1521' size-in-bits='64'
> id='type-id-617'/>
> +    <pointer-type-def type-id='type-id-1522' size-in-bits='64'
> id='type-id-622'/>
> +    <pointer-type-def type-id='type-id-1523' size-in-bits='64'
> id='type-id-615'/>
>      <pointer-type-def type-id='type-id-1524' size-in-bits='64'
> id='type-id-254'/>
>      <pointer-type-def type-id='type-id-1525' size-in-bits='64'
> id='type-id-251'/>
>      <pointer-type-def type-id='type-id-1526' size-in-bits='64'
> id='type-id-250'/>
> @@ -9879,8 +9887,8 @@
>      <pointer-type-def type-id='type-id-1534' size-in-bits='64'
> id='type-id-473'/>
>      <pointer-type-def type-id='type-id-1535' size-in-bits='64'
> id='type-id-549'/>
>      <pointer-type-def type-id='type-id-1536' size-in-bits='64'
> id='type-id-1012'/>
> -    <pointer-type-def type-id='type-id-1537' size-in-bits='64'
> id='type-id-661'/>
> -    <pointer-type-def type-id='type-id-1538' size-in-bits='64'
> id='type-id-666'/>
> +    <pointer-type-def type-id='type-id-1537' size-in-bits='64'
> id='type-id-660'/>
> +    <pointer-type-def type-id='type-id-1538' size-in-bits='64'
> id='type-id-665'/>
>      <pointer-type-def type-id='type-id-1539' size-in-bits='64'
> id='type-id-438'/>
>      <pointer-type-def type-id='type-id-1540' size-in-bits='64'
> id='type-id-572'/>
>      <pointer-type-def type-id='type-id-1541' size-in-bits='64'
> id='type-id-571'/>
> @@ -9896,15 +9904,15 @@
>      <pointer-type-def type-id='type-id-1550' size-in-bits='64'
> id='type-id-1031'/>
>      <pointer-type-def type-id='type-id-1551' size-in-bits='64'
> id='type-id-570'/>
>      <pointer-type-def type-id='type-id-225' size-in-bits='64'
> id='type-id-1552'/>
> -    <qualified-type-def type-id='type-id-164' volatile='yes'
> id='type-id-694'/>
> +    <qualified-type-def type-id='type-id-164' volatile='yes'
> id='type-id-693'/>
>      <pointer-type-def type-id='type-id-243' size-in-bits='64'
> id='type-id-1026'/>
>      <pointer-type-def type-id='type-id-133' size-in-bits='64'
> id='type-id-1086'/>
> -    <pointer-type-def type-id='type-id-725' size-in-bits='64'
> id='type-id-858'/>
> +    <pointer-type-def type-id='type-id-724' size-in-bits='64'
> id='type-id-857'/>
>      <pointer-type-def type-id='type-id-1092' size-in-bits='64'
> id='type-id-1085'/>
>      <pointer-type-def type-id='type-id-241' size-in-bits='64'
> id='type-id-1553'/>
>      <pointer-type-def type-id='type-id-134' size-in-bits='64'
> id='type-id-240'/>
>      <pointer-type-def type-id='type-id-135' size-in-bits='64'
> id='type-id-1554'/>
> -    <pointer-type-def type-id='type-id-137' size-in-bits='64'
> id='type-id-901'/>
> +    <pointer-type-def type-id='type-id-137' size-in-bits='64'
> id='type-id-900'/>
>      <function-decl name='__sdhci_add_host'
> mangled-name='__sdhci_add_host'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='4251' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__sdhci_add_host'>
>        <parameter type-id='type-id-1425' name='host'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='4251' column='1'/>
>        <return type-id='type-id-150'/>
> @@ -9939,11 +9947,11 @@
>        <parameter type-id='type-id-1425' name='host'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='1539' column='1'/>
>        <parameter type-id='type-id-210' name='clock'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='1539' column='1'/>
>        <parameter type-id='type-id-525' name='actual_clock'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='1540' column='1'/>
> -      <return type-id='type-id-272'/>
> +      <return type-id='type-id-275'/>
>      </function-decl>
>      <function-decl name='sdhci_enable_clk'
> mangled-name='sdhci_enable_clk'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='1632' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='sdhci_enable_clk'>
>        <parameter type-id='type-id-1425' name='host'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='1632' column='1'/>
> -      <parameter type-id='type-id-272' name='clk'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='1632' column='1'/>
> +      <parameter type-id='type-id-275' name='clk'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='1632' column='1'/>
>        <return type-id='type-id-224'/>
>      </function-decl>
>      <function-decl name='sdhci_set_clock' mangled-name='sdhci_set_clock'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='1661' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='sdhci_set_clock'>
> @@ -10044,8 +10052,8 @@
>      <function-decl name='sdhci_cqe_irq' mangled-name='sdhci_cqe_irq'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3449' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='sdhci_cqe_irq'>
>        <parameter type-id='type-id-1425' name='host'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3449' column='1'/>
>        <parameter type-id='type-id-197' name='intmask'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3449' column='1'/>
> -      <parameter type-id='type-id-711' name='cmd_error'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3449' column='1'/>
> -      <parameter type-id='type-id-711' name='data_error'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3450' column='1'/>
> +      <parameter type-id='type-id-710' name='cmd_error'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3449' column='1'/>
> +      <parameter type-id='type-id-710' name='data_error'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3450' column='1'/>
>        <return type-id='type-id-235'/>
>      </function-decl>
>      <function-decl name='sdhci_alloc_host'
> mangled-name='sdhci_alloc_host'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3499' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='sdhci_alloc_host'>
> @@ -10056,8 +10064,8 @@
>      <function-decl name='__sdhci_read_caps'
> mangled-name='__sdhci_read_caps'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3568' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__sdhci_read_caps'>
>        <parameter type-id='type-id-1425' name='host'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3568' column='1'/>
>        <parameter type-id='type-id-1474' name='ver'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3568' column='1'/>
> -      <parameter type-id='type-id-780' name='caps'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3568' column='1'/>
> -      <parameter type-id='type-id-780' name='caps1'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3568' column='1'/>
> +      <parameter type-id='type-id-779' name='caps'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3568' column='1'/>
> +      <parameter type-id='type-id-779' name='caps1'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3568' column='1'/>
>        <return type-id='type-id-224'/>
>      </function-decl>
>      <function-decl name='sdhci_setup_host'
> mangled-name='sdhci_setup_host'
> filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c'
> line='3695' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='sdhci_setup_host'>
> @@ -10146,8 +10154,8 @@
>        <return type-id='type-id-1265'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1267'>
> -      <parameter type-id='type-id-767'/>
> -      <return type-id='type-id-764'/>
> +      <parameter type-id='type-id-766'/>
> +      <return type-id='type-id-763'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1268'>
>        <parameter type-id='type-id-1405'/>
> @@ -10180,14 +10188,14 @@
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1281'>
>        <parameter type-id='type-id-369'/>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1282'>
>        <parameter type-id='type-id-369'/>
> -      <parameter type-id='type-id-638'/>
> -      <parameter type-id='type-id-638'/>
>        <parameter type-id='type-id-635'/>
> +      <parameter type-id='type-id-635'/>
> +      <parameter type-id='type-id-629'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1283'>
> @@ -10369,7 +10377,7 @@
>        <parameter type-id='type-id-365'/>
>        <parameter type-id='type-id-210'/>
>        <parameter type-id='type-id-210'/>
> -      <parameter type-id='type-id-893'/>
> +      <parameter type-id='type-id-892'/>
>        <parameter type-id='type-id-1552'/>
>        <return type-id='type-id-150'/>
>      </function-type>
> @@ -10379,7 +10387,7 @@
>        <parameter type-id='type-id-365'/>
>        <parameter type-id='type-id-210'/>
>        <parameter type-id='type-id-210'/>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <parameter type-id='type-id-225'/>
>        <return type-id='type-id-150'/>
>      </function-type>
> @@ -10410,7 +10418,7 @@
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1318'>
>        <parameter type-id='type-id-441'/>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1319'>
> @@ -10576,10 +10584,10 @@
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1348'>
> -      <parameter type-id='type-id-714'/>
> +      <parameter type-id='type-id-713'/>
>        <parameter type-id='type-id-1230'/>
>        <parameter type-id='type-id-1228'/>
> -      <parameter type-id='type-id-714'/>
> +      <parameter type-id='type-id-713'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1349'>
> @@ -10631,7 +10639,7 @@
>        <parameter type-id='type-id-210'/>
>        <parameter type-id='type-id-150'/>
>        <parameter type-id='type-id-150'/>
> -      <parameter type-id='type-id-711'/>
> +      <parameter type-id='type-id-710'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1360'>
> @@ -10669,22 +10677,22 @@
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1367'>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1368'>
> -      <parameter type-id='type-id-638'/>
> -      <parameter type-id='type-id-607'/>
> +      <parameter type-id='type-id-635'/>
> +      <parameter type-id='type-id-601'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1369'>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <parameter type-id='type-id-211'/>
>        <parameter type-id='type-id-211'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1370'>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <parameter type-id='type-id-1554'/>
>        <return type-id='type-id-150'/>
>      </function-type>
> @@ -10729,7 +10737,7 @@
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1380'>
>        <parameter type-id='type-id-383'/>
> -      <parameter type-id='type-id-711'/>
> +      <parameter type-id='type-id-710'/>
>        <parameter type-id='type-id-24'/>
>        <return type-id='type-id-150'/>
>      </function-type>
> @@ -10759,8 +10767,8 @@
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1385'>
>        <parameter type-id='type-id-383'/>
> -      <parameter type-id='type-id-638'/>
> -      <parameter type-id='type-id-607'/>
> +      <parameter type-id='type-id-635'/>
> +      <parameter type-id='type-id-601'/>
>        <return type-id='type-id-150'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1386'>
> @@ -10845,7 +10853,7 @@
>      <function-type size-in-bits='64' id='type-id-1414'>
>        <parameter type-id='type-id-222'/>
>        <parameter type-id='type-id-211'/>
> -      <return type-id='type-id-638'/>
> +      <return type-id='type-id-635'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1417'>
>        <parameter type-id='type-id-148'/>
> @@ -10889,13 +10897,13 @@
>        <return type-id='type-id-235'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1443'>
> -      <parameter type-id='type-id-638'/>
> -      <parameter type-id='type-id-636'/>
> +      <parameter type-id='type-id-635'/>
> +      <parameter type-id='type-id-630'/>
>        <return type-id='type-id-235'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1444'>
>        <parameter type-id='type-id-279'/>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <parameter type-id='type-id-211'/>
>        <parameter type-id='type-id-239'/>
>        <parameter type-id='type-id-1114'/>
> @@ -10904,7 +10912,7 @@
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1445'>
>        <parameter type-id='type-id-279'/>
> -      <parameter type-id='type-id-894'/>
> +      <parameter type-id='type-id-893'/>
>        <parameter type-id='type-id-239'/>
>        <parameter type-id='type-id-1114'/>
>        <parameter type-id='type-id-211'/>
> @@ -10915,7 +10923,7 @@
>        <return type-id='type-id-993'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1447'>
> -      <return type-id='type-id-761'/>
> +      <return type-id='type-id-760'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1448'>
>        <parameter type-id='type-id-441'/>
> @@ -10934,8 +10942,8 @@
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1450'>
>        <parameter type-id='type-id-369'/>
> -      <parameter type-id='type-id-632'/>
> -      <return type-id='type-id-632'/>
> +      <parameter type-id='type-id-626'/>
> +      <return type-id='type-id-626'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1451'>
>        <parameter type-id='type-id-279'/>
> @@ -10973,14 +10981,14 @@
>      <function-type size-in-bits='64' id='type-id-1456'>
>        <parameter type-id='type-id-441'/>
>        <parameter type-id='type-id-1407'/>
> -      <parameter type-id='type-id-740'/>
> +      <parameter type-id='type-id-739'/>
>        <parameter type-id='type-id-239'/>
>        <parameter type-id='type-id-210'/>
>        <return type-id='type-id-346'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1457'>
>        <parameter type-id='type-id-441'/>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <parameter type-id='type-id-150'/>
>        <parameter type-id='type-id-239'/>
>        <parameter type-id='type-id-1407'/>
> @@ -11035,7 +11043,7 @@
>        <return type-id='type-id-346'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1465'>
> -      <parameter type-id='type-id-740'/>
> +      <parameter type-id='type-id-739'/>
>        <parameter type-id='type-id-441'/>
>        <parameter type-id='type-id-1407'/>
>        <parameter type-id='type-id-239'/>
> @@ -11081,12 +11089,12 @@
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1472'>
>        <parameter type-id='type-id-1481'/>
> -      <return type-id='type-id-671'/>
> +      <return type-id='type-id-670'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1473'>
>        <parameter type-id='type-id-1481'/>
> -      <parameter type-id='type-id-687'/>
> -      <return type-id='type-id-671'/>
> +      <parameter type-id='type-id-686'/>
> +      <return type-id='type-id-670'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1476'>
>        <parameter type-id='type-id-1425'/>
> @@ -11113,7 +11121,7 @@
>        <parameter type-id='type-id-1415'/>
>        <return type-id='type-id-376'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-855'>
> +    <function-type size-in-bits='64' id='type-id-854'>
>        <return type-id='type-id-224'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1482'>
> @@ -11139,7 +11147,7 @@
>        <return type-id='type-id-224'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1487'>
> -      <parameter type-id='type-id-604'/>
> +      <parameter type-id='type-id-901'/>
>        <return type-id='type-id-224'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1488'>
> @@ -11242,7 +11250,7 @@
>        <parameter type-id='type-id-150'/>
>        <return type-id='type-id-224'/>
>      </function-type>
> -    <function-type size-in-bits='64' id='type-id-852'>
> +    <function-type size-in-bits='64' id='type-id-851'>
>        <parameter type-id='type-id-150'/>
>        <return type-id='type-id-224'/>
>      </function-type>
> @@ -11319,17 +11327,17 @@
>        <return type-id='type-id-224'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1521'>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <return type-id='type-id-224'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1522'>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <parameter type-id='type-id-1186'/>
>        <parameter type-id='type-id-1186'/>
>        <return type-id='type-id-224'/>
>      </function-type>
>      <function-type size-in-bits='64' id='type-id-1523'>
> -      <parameter type-id='type-id-638'/>
> +      <parameter type-id='type-id-635'/>
>        <parameter type-id='type-id-210'/>
>        <parameter type-id='type-id-210'/>
>        <return type-id='type-id-224'/>
> @@ -11447,7 +11455,7 @@
>        <parameter type-id='type-id-279'/>
>        <parameter type-id='type-id-239'/>
>        <parameter type-id='type-id-1262'/>
> -      <parameter type-id='type-id-607'/>
> +      <parameter type-id='type-id-601'/>
>        <parameter type-id='type-id-211'/>
>        <return type-id='type-id-225'/>
>      </function-type>
> diff --git a/tests/data/test-read-dwarf/test-PR26568-1.c
> b/tests/data/test-read-dwarf/test-PR26568-1.c
> new file mode 100644
> index 0000000..6eec355
> --- /dev/null
> +++ b/tests/data/test-read-dwarf/test-PR26568-1.c
> @@ -0,0 +1,15 @@
> +struct A {
> +  union {
> +    struct {
> +      int x;
> +    };
> +    struct {
> +      long y;
> +    };
> +  };
> +};
> +
> +void fun(struct A * a) {
> +  a->x = 0;
> +  a->y = 0x0102030405060708ULL;
> +}
> diff --git a/tests/data/test-read-dwarf/test-PR26568-1.o
> b/tests/data/test-read-dwarf/test-PR26568-1.o
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..9249e16d4d52b4556b1cf071cc504d2a71204619
> GIT binary patch
> literal 2864
> zcmbtV&2Jl35TCctADe9KIx)~j;jl<lZKUoxNfTp=Qd~lbD^L|h>IJDv*Y?_8u-Dak
> z11<=0pddwnR3s!oLU4csHxLI7TtMOg{{VkN&xl(k4luL(p1pqAs8V^7-^~1GelzpF
> z*6&_@<t2?Vkb}Wxm|7AAxSgBo^+>Hl8J6Hi<LG|l=$!|R53fG>J;F(A{H*75*$mfM
> z<EV7=w;$1wiJW?r`&faqku#pO4C8fF`50J+6y#>Io*#myv)rp_@;kutqyS{~EQy@X
> zv=C+9qG^{P{R-%ey^q?QLpIEJ4t-z?k&crr$-ev^EyF<<DcUDJSkNgKutj#ZST=ZZ
> zrMSqJ@}<-0Ei=QoWISiEGPY3wu9I=CTr;rAr@=5T8(hb(gj&STPA3@o0$f9)US?dM
> z=9wduGR)iT`Q<p}xn(L@Kl9lO%T&t9PD*KK02WSRDar&FsAXyvuxw(;)g_=veGz93
> z&f(11Kg9yh(b?mHFbLgIXzlH9RJW=%Yu#?e+_^YC8r)#-eXW-@4OzR_Z<ssgrd_kQ
> z%#F46t+ndLMf3c=+cq0c7~|H(XID*Y5FYyOcGvaYz-yuD1g+loxK_2Qo2J!;N^dxD
> zEA3(XHLue3!b;z3I!&+Zc>PMp8@r<lH8rZVozRI?D{!5*)qc|nI?x~bU6by`@y2&|
> zb}pIcvB}kk_ZTnpu~-0mYaiIS#8wva`aRs1ClRL~jc8M^6iXjyJB8dW42a>>8L4>X
> z|Nb}4$x~k#Zm>8?mBZ1KHn@0Hs*gkBu_l}x@(F9Ia+sSM35^3@%9O#Okb+YGc;Qn9
> zhsmp(c$ZLHO6<er!X7(JdbaqE1am&26C^Veo?OKuIdMq*<Jg49g_L+h*vmrFxlL|7
> z>Z<~$_~d!tOyE@auCPB6Qq7a>KPzHLlun4>JOMWaPCX|31bcL65IRkiVGzrn)IxV0
> zf=zD-?B-|$cHs6MyX`g)y9b`%8KN)Jon|v|-<WYbf#Y}GSxVpYT}i<bV7G>Yfs60Z
> z_J^Ts<Eyhqq0@R@ByxKPoxmBmqVfMJR*+A7EB8~Ts|#gvkAzLJ$?+5#gsCs;r1n%k
> zeLCqLJSu-()JHKhWc{CJ(74wmL?3+mE3GF%)W3`WU*T7Q)4d`{-dX(Dh{iU~>YB*0
> zBEWB>sOhA}?x9P?DEb!xu1%?trpCUEXj=chY)q7V>Yu(=YX5D-)SSfpOMneB5<`tW
> zKwnz@&qaN?PgI}YwOao+Vw6+%iE1>S5s&dJ2?#0cOZhh9Y5YG0-+l=HuHY+Sz|{*W
> z0%Tno|ApYsd^-@+1-~W(g_P@;@TaJx?cWb6`$zu<k}vm_`cZ3B?z*VICmN>jH~q_~
> hd^(e~rQV~aa6A!<$*iuQ@}}|s5dD8MVaAHe{|}8}$8i7v
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/test-read-dwarf/test-PR26568-1.o.abi
> b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
> new file mode 100644
> index 0000000..867fe22
> --- /dev/null
> +++ b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
> @@ -0,0 +1,38 @@
> +<abi-corpus path='data/test-read-dwarf/test-PR26568-1.o'>
> +  <elf-function-symbols>
> +    <elf-symbol name='fun' type='func-type' binding='global-binding'
> visibility='default-visibility' is-defined='yes'/>
> +  </elf-function-symbols>
> +  <abi-instr version='1.0' address-size='64' path='test-PR26568-1.c'
> comp-dir-path='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf'
> language='LANG_C89'>
> +    <type-decl name='int' size-in-bits='32' id='type-id-1'/>
> +    <type-decl name='long int' size-in-bits='64' id='type-id-2'/>
> +    <type-decl name='void' id='type-id-3'/>
> +    <class-decl name='A' size-in-bits='64' is-struct='yes'
> visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c'
> line='1' column='1' id='type-id-4'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='' type-id='type-id-5' visibility='default'/>
> +      </data-member>
> +    </class-decl>
> +    <union-decl name='__anonymous_union__' size-in-bits='64'
> is-anonymous='yes' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c'
> line='2' column='1' id='type-id-5'>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-6' visibility='default'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-7' visibility='default'/>
> +      </data-member>
> +    </union-decl>
> +    <class-decl name='__anonymous_struct__' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c'
> line='3' column='1' id='type-id-6'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='x' type-id='type-id-1' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c'
> line='4' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <class-decl name='__anonymous_struct__1' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c'
> line='6' column='1' id='type-id-7'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='y' type-id='type-id-2' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c'
> line='7' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <pointer-type-def type-id='type-id-4' size-in-bits='64'
> id='type-id-8'/>
> +    <function-decl name='fun' mangled-name='fun'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c'
> line='12' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='fun'>
> +      <parameter type-id='type-id-8' name='a'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c'
> line='12' column='1'/>
> +      <return type-id='type-id-3'/>
> +    </function-decl>
> +  </abi-instr>
> +</abi-corpus>
> diff --git a/tests/data/test-read-dwarf/test-PR26568-2.c
> b/tests/data/test-read-dwarf/test-PR26568-2.c
> new file mode 100644
> index 0000000..656e8ee
> --- /dev/null
> +++ b/tests/data/test-read-dwarf/test-PR26568-2.c
> @@ -0,0 +1,13 @@
> +union A {
> +  struct {
> +    int x;
> +  };
> +  struct {
> +    long y;
> +  };
> +};
> +
> +void fun(union A * a) {
> +  a->x = 0;
> +  a->y = 0x0102030405060708ULL;
> +}
> diff --git a/tests/data/test-read-dwarf/test-PR26568-2.o
> b/tests/data/test-read-dwarf/test-PR26568-2.o
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..cc94708c9cb10e2f0f5e51aed7e7a713767caaf8
> GIT binary patch
> literal 2824
> zcmbtVQHvW@6h3!mlT3CtF`KB}WqlaI(k^r++wE?Mm9433-4sh%7W$x2)=6@cj3$#Z
> znXRc(6clk0L_rZnw9p4%efCN4q2P}YU-|=lEBK)2%-owy?oKJ_fw}kG@0{<PbMM?U
> z^TCyCuW5{d6b6@Iwvs47Gdt58k=lR?l;KA6_+j(-?xW^sR~|ixaMGH;7`bd_LDyLG
> zxODTk`)F8*j7AjuM1s?iF&?x9rZrI2C%|-4kh_ra{17yQW!}W4eg{~V6o8D8p(%SA
> z490Gwma}QtBhcs``M?%QC6PJU_xEs>chN+O_GKRy4Hq?F%j|TqV(P`U;xa4eN~h3T
> zVWxS}e92@L%v%86pvBcn-NdS10Moo=>IRk})FPI0is{CTlPkbgq#6!;c{L`VS*75O
> zm2X~IrJ(uDG^n-$u=o@PB?g?M;;1aZ1PPJ*NI;SLDvlbQ!I81Qiv=8`*NSJ&AmroF
> z-apu^ZP)7drqhnO`8Yf-^gR3MN28)?$U5P>cm0O7Yi&7oXWQD`IKRD7+q__%J>VUy
> z>4q_GUwCodvWMZ3&v$y<=YiM8r5m*SJCl0Nu5DR%532pqkXJjS&f8wK=Y`dQ*K%84
> z&-Dh?t~cT1DrFv5J8tMksvU5*V|U(lgDwn4e$S#i0DHT;7p=2c)B2N3!ks-GZxz^k
> z2f!vJwziZrzQ8ki4sm)&q7%JbEPbNw7P4=lLky>mNX4uC*FR}SJ+*W2bj5pAIXYU>
> zL>JAX+H^=XVZx|GF0q=aI^<`Igr)=D-W1WHkb+YEc&}4Lhouu}8If}09HzJR#I>UC
> z#C8!8s7<9#kc><??P8fg6gf*gMgg7?ip1X#>s2w+dz)T&)Yk=0{>k@!Gl5gyuf_VV
> znAJG4W{Q&$J~WktuKI612Db!GH74r>XMATEx-Fc;AfEeD3;84jhx!Ga)_4p~zz43=
> z;jN?Iq33r;Xp3~W)e89SIkOwMevi*n2A<C)1yg|29u0>ad(QDkA$PFl>~ZL}-w}a$
> z|F9dlLoN#cpVJ!h>8#{=%5V*#Oz)9clW$U<#|2?(M?J1Ql~3PIx(EN2e_rIrX-;JR
> zpXSiG)+9t<d-_E-k|63I#{W(DRp4~52$FXee;JYN;Hd723`+w1Jo1_is_#CURE)g8
> z6X3>-8fmKU>xib+-^j#7$*211Yo*rTK}?NF%-;prq(wqh-$S&e<-aBJ%X6aq)YoeM
> zTZmCiStqKIltnZCAOSJU{BnLD@ihL=g6}+m|FPgJZt%z4$6#iac_s3#;H&O`3ZO0>
> z#Vq$P;jd6hJHJm;&X4{Ek}uDd>QQr3>=n^a`=Vg_e$!t@<<mP+dk-P#Q&A|-#?y3E
> T_fK)t`1eHp_ovKQQThJ@<ln>C
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/test-read-dwarf/test-PR26568-2.o.abi
> b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
> new file mode 100644
> index 0000000..c6eda38
> --- /dev/null
> +++ b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
> @@ -0,0 +1,33 @@
> +<abi-corpus path='data/test-read-dwarf/test-PR26568-2.o'>
> +  <elf-function-symbols>
> +    <elf-symbol name='fun' type='func-type' binding='global-binding'
> visibility='default-visibility' is-defined='yes'/>
> +  </elf-function-symbols>
> +  <abi-instr version='1.0' address-size='64' path='test-PR26568-2.c'
> comp-dir-path='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf'
> language='LANG_C89'>
> +    <type-decl name='int' size-in-bits='32' id='type-id-1'/>
> +    <type-decl name='long int' size-in-bits='64' id='type-id-2'/>
> +    <type-decl name='void' id='type-id-3'/>
> +    <union-decl name='A' size-in-bits='64' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-2.c'
> line='1' column='1' id='type-id-4'>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-5' visibility='default'/>
> +      </data-member>
> +      <data-member access='private'>
> +        <var-decl name='' type-id='type-id-6' visibility='default'/>
> +      </data-member>
> +    </union-decl>
> +    <class-decl name='__anonymous_struct__' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-2.c'
> line='2' column='1' id='type-id-5'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='x' type-id='type-id-1' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-2.c'
> line='3' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <class-decl name='__anonymous_struct__1' size-in-bits='64'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-2.c'
> line='5' column='1' id='type-id-6'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <var-decl name='y' type-id='type-id-2' visibility='default'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-2.c'
> line='6' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <pointer-type-def type-id='type-id-4' size-in-bits='64'
> id='type-id-7'/>
> +    <function-decl name='fun' mangled-name='fun'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-2.c'
> line='10' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='fun'>
> +      <parameter type-id='type-id-7' name='a'
> filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-2.c'
> line='10' column='1'/>
> +      <return type-id='type-id-3'/>
> +    </function-decl>
> +  </abi-instr>
> +</abi-corpus>
> diff --git a/tests/test-read-dwarf.cc b/tests/test-read-dwarf.cc
> index 3f93d6d..c93f176 100644
> --- a/tests/test-read-dwarf.cc
> +++ b/tests/test-read-dwarf.cc
> @@ -380,6 +380,20 @@ InOutSpec in_out_specs[] =
>      "data/test-read-dwarf/PR26261/PR26261-exe.abi",
>      "output/test-read-dwarf/PR26261/PR26261-exe.abi",
>    },
> +  {
> +    "data/test-read-dwarf/test-PR26568-1.o",
> +    "",
> +    SEQUENCE_TYPE_ID_STYLE,
> +    "data/test-read-dwarf/test-PR26568-1.o.abi",
> +    "output/test-read-dwarf/test-PR26568-1.o.abi",
> +  },
> +  {
> +    "data/test-read-dwarf/test-PR26568-2.o",
> +    "",
> +    SEQUENCE_TYPE_ID_STYLE,
> +    "data/test-read-dwarf/test-PR26568-2.o.abi",
> +    "output/test-read-dwarf/test-PR26568-2.o.abi",
> +  },
>    // This should be the last entry.
>    {NULL, NULL, SEQUENCE_TYPE_ID_STYLE, NULL, NULL}
>  };
> --
> 1.8.3.1
>
>
> --
>                 Dodji
>
>