diff mbox series

[1/6] writer: Emit definitions of declarations when they are present

Message ID 87czzy7mw5.fsf@redhat.com
State Committed
Headers show
Series Fix subtle ABI artifact representation issues | expand

Commit Message

Dodji Seketeli Nov. 27, 2020, 5:03 p.m. UTC
Hello,

Libabigail goes a long way to resolve declaration-only classes
to their definitions when it's possible.

The ABIXML writer however sometimes forgets to emit the definition of
such declarations that have been "resolved".

Later, when the binary is compared to its own ABIXML representation,
the reporting engine thus reports that the definition is lost.

This patch fixes that.

	* src/abg-writer.cc (write_class_decl, write_union_decl): Get the
	definition of the declaration if it exists and emit that.
	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Adjust.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise.
	* tests/data/test-annotate/test13-pr18894.so.abi: Likewise.
	* tests/data/test-annotate/test15-pr18892.so.abi: Likewise.
	* tests/data/test-annotate/test21-pr19092.so.abi: Likewise.

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

Applied to master.
---
 src/abg-writer.cc                             |   16 +-
 .../data/test-annotate/test13-pr18894.so.abi  | 1662 ++++++----
 .../data/test-annotate/test15-pr18892.so.abi  | 2277 ++++++-------
 .../data/test-annotate/test21-pr19092.so.abi  | 2829 +++++++++--------
 .../test-read-dwarf/test13-pr18894.so.abi     | 1511 +++++----
 .../test-read-dwarf/test15-pr18892.so.abi     | 2269 ++++++-------
 .../test-read-dwarf/test21-pr19092.so.abi     | 2782 ++++++++--------
 7 files changed, 7247 insertions(+), 6099 deletions(-)

Comments

Giuliano Procida Nov. 30, 2020, 1:49 p.m. UTC | #1
Hi Dodji.

I had a quick scan through this.

Do we need  look_through_decl_only_enum  somewhere as well?

Regards,
Giuliano.

On Fri, 27 Nov 2020 at 17:06, Dodji Seketeli via Libabigail <
libabigail@sourceware.org> wrote:

> Hello,
>
> Libabigail goes a long way to resolve declaration-only classes
> to their definitions when it's possible.
>
> The ABIXML writer however sometimes forgets to emit the definition of
> such declarations that have been "resolved".
>
> Later, when the binary is compared to its own ABIXML representation,
> the reporting engine thus reports that the definition is lost.
>
> This patch fixes that.
>
>         * src/abg-writer.cc (write_class_decl, write_union_decl): Get the
>         definition of the declaration if it exists and emit that.
>         * tests/data/test-read-dwarf/test13-pr18894.so.abi: Adjust.
>         * tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
>         * tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise.
>         * tests/data/test-annotate/test13-pr18894.so.abi: Likewise.
>         * tests/data/test-annotate/test15-pr18892.so.abi: Likewise.
>         * tests/data/test-annotate/test21-pr19092.so.abi: Likewise.
>
> Signed-off-by: Dodji Seketeli <dodji@redhat.com>
>
> Applied to master.
> ---
>  src/abg-writer.cc                             |   16 +-
>  .../data/test-annotate/test13-pr18894.so.abi  | 1662 ++++++----
>  .../data/test-annotate/test15-pr18892.so.abi  | 2277 ++++++-------
>  .../data/test-annotate/test21-pr19092.so.abi  | 2829 +++++++++--------
>  .../test-read-dwarf/test13-pr18894.so.abi     | 1511 +++++----
>  .../test-read-dwarf/test15-pr18892.so.abi     | 2269 ++++++-------
>  .../test-read-dwarf/test21-pr19092.so.abi     | 2782 ++++++++--------
>  7 files changed, 7247 insertions(+), 6099 deletions(-)
>
> diff --git a/src/abg-writer.cc b/src/abg-writer.cc
> index 4370fe37..d9153e09 100644
> --- a/src/abg-writer.cc
> +++ b/src/abg-writer.cc
> @@ -3558,7 +3558,7 @@ write_union_decl_opening_tag(const union_decl_sptr&
>      decl,
>
>  /// Serialize a class_decl type.
>  ///
> -/// @param decl the pointer to class_decl to serialize.
> +/// @param d the pointer to class_decl to serialize.
>  ///
>  /// @param id the type id identitifier to use in the serialized
>  /// output.  If this is empty, the function will compute an
> @@ -3572,14 +3572,16 @@ write_union_decl_opening_tag(const
> union_decl_sptr&     decl,
>  ///
>  /// @param indent the initial indentation to use.
>  static bool
> -write_class_decl(const class_decl_sptr& decl,
> +write_class_decl(const class_decl_sptr& d,
>                  const string&          id,
>                  write_context& ctxt,
>                  unsigned               indent)
>  {
> -  if (!decl)
> +  if (!d)
>      return false;
>
> +  class_decl_sptr decl = is_class_type(look_through_decl_only_class(d));
> +
>    annotate(decl, ctxt, indent);
>
>    ostream& o = ctxt.get_ostream();
> @@ -3777,7 +3779,7 @@ write_class_decl(const class_decl_sptr& decl,
>
>  /// Serialize a @ref union_decl type.
>  ///
> -/// @param decl the pointer to @ref union_decl to serialize.
> +/// @param d the pointer to @ref union_decl to serialize.
>  ///
>  /// @param ctxt the context of the serialization.
>  ///
> @@ -3785,14 +3787,16 @@ write_class_decl(const class_decl_sptr& decl,
>  ///
>  /// @return true upon successful completion.
>  static bool
> -write_union_decl(const union_decl_sptr& decl,
> +write_union_decl(const union_decl_sptr& d,
>                  const string& id,
>                  write_context& ctxt,
>                  unsigned indent)
>  {
> -  if (!decl)
> +  if (!d)
>      return false;
>
> +  union_decl_sptr decl = is_union_type(look_through_decl_only_class(d));
> +
>    annotate(decl, ctxt, indent);
>
>    ostream& o = ctxt.get_ostream();
> diff --git a/tests/data/test-annotate/test13-pr18894.so.abi
> b/tests/data/test-annotate/test13-pr18894.so.abi
> index 1b3f8910..5e51cac5 100644
> --- a/tests/data/test-annotate/test13-pr18894.so.abi
> +++ b/tests/data/test-annotate/test13-pr18894.so.abi
> @@ -666,30 +666,191 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-bus.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- struct DBusConnection -->
> -    <class-decl name='DBusConnection' size-in-bits='2112' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-25'/>
> +    <class-decl name='DBusConnection' size-in-bits='2112' is-struct='yes'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='257' column='1' id='type-id-25'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- DBusAtomic DBusConnection::refcount -->
> +        <var-decl name='refcount' type-id='type-id-26'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='258' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <!-- DBusRMutex* DBusConnection::mutex -->
> +        <var-decl name='mutex' type-id='type-id-27' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='260' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='128'>
> +        <!-- DBusCMutex* DBusConnection::dispatch_mutex -->
> +        <var-decl name='dispatch_mutex' type-id='type-id-28'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='262' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='192'>
> +        <!-- DBusCondVar* DBusConnection::dispatch_cond -->
> +        <var-decl name='dispatch_cond' type-id='type-id-29'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='263' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='256'>
> +        <!-- DBusCMutex* DBusConnection::io_path_mutex -->
> +        <var-decl name='io_path_mutex' type-id='type-id-28'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='264' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='320'>
> +        <!-- DBusCondVar* DBusConnection::io_path_cond -->
> +        <var-decl name='io_path_cond' type-id='type-id-29'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='265' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='384'>
> +        <!-- DBusList* DBusConnection::outgoing_messages -->
> +        <var-decl name='outgoing_messages' type-id='type-id-8'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='267' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='448'>
> +        <!-- DBusList* DBusConnection::incoming_messages -->
> +        <var-decl name='incoming_messages' type-id='type-id-8'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='268' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='512'>
> +        <!-- DBusList* DBusConnection::expired_messages -->
> +        <var-decl name='expired_messages' type-id='type-id-8'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='269' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='576'>
> +        <!-- DBusMessage* DBusConnection::message_borrowed -->
> +        <var-decl name='message_borrowed' type-id='type-id-30'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='271' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='640'>
> +        <!-- int DBusConnection::n_outgoing -->
> +        <var-decl name='n_outgoing' type-id='type-id-2'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='275' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='672'>
> +        <!-- int DBusConnection::n_incoming -->
> +        <var-decl name='n_incoming' type-id='type-id-2'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='276' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='704'>
> +        <!-- DBusCounter* DBusConnection::outgoing_counter -->
> +        <var-decl name='outgoing_counter' type-id='type-id-31'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='278' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='768'>
> +        <!-- DBusTransport* DBusConnection::transport -->
> +        <var-decl name='transport' type-id='type-id-32'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='280' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='832'>
> +        <!-- DBusWatchList* DBusConnection::watches -->
> +        <var-decl name='watches' type-id='type-id-33'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='281' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='896'>
> +        <!-- DBusTimeoutList* DBusConnection::timeouts -->
> +        <var-decl name='timeouts' type-id='type-id-34'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='282' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='960'>
> +        <!-- DBusList* DBusConnection::filter_list -->
> +        <var-decl name='filter_list' type-id='type-id-8'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='284' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1024'>
> +        <!-- DBusRMutex* DBusConnection::slot_mutex -->
> +        <var-decl name='slot_mutex' type-id='type-id-27'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='286' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1088'>
> +        <!-- DBusDataSlotList DBusConnection::slot_list -->
> +        <var-decl name='slot_list' type-id='type-id-35'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='287' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1216'>
> +        <!-- DBusHashTable* DBusConnection::pending_replies -->
> +        <var-decl name='pending_replies' type-id='type-id-36'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='289' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1280'>
> +        <!-- dbus_uint32_t DBusConnection::client_serial -->
> +        <var-decl name='client_serial' type-id='type-id-16'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='291' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1344'>
> +        <!-- DBusList* DBusConnection::disconnect_message_link -->
> +        <var-decl name='disconnect_message_link' type-id='type-id-8'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='292' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1408'>
> +        <!-- DBusWakeupMainFunction DBusConnection::wakeup_main_function
> -->
> +        <var-decl name='wakeup_main_function' type-id='type-id-37'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='294' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1472'>
> +        <!-- void* DBusConnection::wakeup_main_data -->
> +        <var-decl name='wakeup_main_data' type-id='type-id-10'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='295' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1536'>
> +        <!-- DBusFreeFunction DBusConnection::free_wakeup_main_data -->
> +        <var-decl name='free_wakeup_main_data' type-id='type-id-38'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='296' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1600'>
> +        <!-- DBusDispatchStatusFunction
> DBusConnection::dispatch_status_function -->
> +        <var-decl name='dispatch_status_function' type-id='type-id-39'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='298' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1664'>
> +        <!-- void* DBusConnection::dispatch_status_data -->
> +        <var-decl name='dispatch_status_data' type-id='type-id-10'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='299' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1728'>
> +        <!-- DBusFreeFunction DBusConnection::free_dispatch_status_data
> -->
> +        <var-decl name='free_dispatch_status_data' type-id='type-id-38'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='300' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1792'>
> +        <!-- DBusDispatchStatus DBusConnection::last_dispatch_status -->
> +        <var-decl name='last_dispatch_status' type-id='type-id-40'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='302' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1856'>
> +        <!-- DBusObjectTree* DBusConnection::objects -->
> +        <var-decl name='objects' type-id='type-id-41'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='304' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1920'>
> +        <!-- char* DBusConnection::server_guid -->
> +        <var-decl name='server_guid' type-id='type-id-22'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='306' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1984'>
> +        <!-- dbus_bool_t DBusConnection::dispatch_acquired -->
> +        <var-decl name='dispatch_acquired' type-id='type-id-17'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='312' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='2016'>
> +        <!-- dbus_bool_t DBusConnection::io_path_acquired -->
> +        <var-decl name='io_path_acquired' type-id='type-id-17'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='313' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='31'>
> +        <!-- unsigned int DBusConnection::shareable -->
> +        <var-decl name='shareable' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='315' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='30'>
> +        <!-- unsigned int DBusConnection::exit_on_disconnect -->
> +        <var-decl name='exit_on_disconnect' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='317' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='29'>
> +        <!-- unsigned int DBusConnection::route_peer_messages -->
> +        <var-decl name='route_peer_messages' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='319' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='28'>
> +        <!-- unsigned int DBusConnection::disconnected_message_arrived -->
> +        <var-decl name='disconnected_message_arrived' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='321' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='27'>
> +        <!-- unsigned int DBusConnection::disconnected_message_processed
> -->
> +        <var-decl name='disconnected_message_processed'
> type-id='type-id-3' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='325' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='26'>
> +        <!-- unsigned int DBusConnection::have_connection_lock -->
> +        <var-decl name='have_connection_lock' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='330' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='2080'>
> +        <!-- int DBusConnection::generation -->
> +        <var-decl name='generation' type-id='type-id-2'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='334' column='1'/>
> +      </data-member>
> +    </class-decl>
>      <!-- unnamed&#45;enum&#45;underlying&#45;type&#45;32 -->
> -    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes'
> size-in-bits='32' alignment-in-bits='32' id='type-id-26'/>
> +    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes'
> size-in-bits='32' alignment-in-bits='32' id='type-id-42'/>
>      <!-- unsigned long int -->
> -    <type-decl name='unsigned long int' size-in-bits='64'
> id='type-id-27'/>
> +    <type-decl name='unsigned long int' size-in-bits='64'
> id='type-id-43'/>
>      <!-- typedef DBusConnection DBusConnection -->
> -    <typedef-decl name='DBusConnection' type-id='type-id-25'
> filepath='../dbus/dbus-connection.h' line='51' column='1' id='type-id-28'/>
> +    <typedef-decl name='DBusConnection' type-id='type-id-25'
> filepath='../dbus/dbus-connection.h' line='51' column='1' id='type-id-44'/>
>      <!-- typedef __anonymous_enum__ DBusBusType -->
> -    <typedef-decl name='DBusBusType' type-id='type-id-29'
> filepath='../dbus/dbus-shared.h' line='61' column='1' id='type-id-30'/>
> +    <typedef-decl name='DBusBusType' type-id='type-id-45'
> filepath='../dbus/dbus-shared.h' line='61' column='1' id='type-id-46'/>
>      <!-- enum __anonymous_enum__ -->
> -    <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> filepath='../dbus/dbus-shared.h' line='57' column='1' id='type-id-29'>
> -      <underlying-type type-id='type-id-26'/>
> +    <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> filepath='../dbus/dbus-shared.h' line='57' column='1' id='type-id-45'>
> +      <underlying-type type-id='type-id-42'/>
>        <enumerator name='DBUS_BUS_SESSION' value='0'/>
>        <enumerator name='DBUS_BUS_SYSTEM' value='1'/>
>        <enumerator name='DBUS_BUS_STARTER' value='2'/>
>      </enum-decl>
>      <!-- DBusConnection* -->
> -    <pointer-type-def type-id='type-id-28' size-in-bits='64'
> id='type-id-31'/>
> +    <pointer-type-def type-id='type-id-44' size-in-bits='64'
> id='type-id-47'/>
>      <!-- dbus_uint32_t* -->
> -    <pointer-type-def type-id='type-id-16' size-in-bits='64'
> id='type-id-32'/>
> +    <pointer-type-def type-id='type-id-16' size-in-bits='64'
> id='type-id-48'/>
>      <!-- void dbus_bus_remove_match(DBusConnection*, const char*,
> DBusError*) -->
>      <function-decl name='dbus_bus_remove_match'
> mangled-name='dbus_bus_remove_match'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1576' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_remove_match'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1576' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1576' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='rule'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1577' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
> @@ -700,7 +861,7 @@
>      <!-- void dbus_bus_add_match(DBusConnection*, const char*,
> DBusError*) -->
>      <function-decl name='dbus_bus_add_match'
> mangled-name='dbus_bus_add_match'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1526' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_add_match'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1526' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1526' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='rule'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1527' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
> @@ -711,13 +872,13 @@
>      <!-- dbus_bool_t dbus_bus_start_service_by_name(DBusConnection*,
> const char*, dbus_uint32_t, dbus_uint32_t*, DBusError*) -->
>      <function-decl name='dbus_bus_start_service_by_name'
> mangled-name='dbus_bus_start_service_by_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1356' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_start_service_by_name'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1356' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1356' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1357' column='1'/>
>        <!-- parameter of type 'typedef dbus_uint32_t' -->
>        <parameter type-id='type-id-16' name='flags'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1358' column='1'/>
>        <!-- parameter of type 'dbus_uint32_t*' -->
> -      <parameter type-id='type-id-32' name='result'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1359' column='1'/>
> +      <parameter type-id='type-id-48' name='result'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1359' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1360' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -726,7 +887,7 @@
>      <!-- dbus_bool_t dbus_bus_name_has_owner(DBusConnection*, const
> char*, DBusError*) -->
>      <function-decl name='dbus_bus_name_has_owner'
> mangled-name='dbus_bus_name_has_owner'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1280' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_name_has_owner'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1280' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1280' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1281' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
> @@ -737,7 +898,7 @@
>      <!-- int dbus_bus_release_name(DBusConnection*, const char*,
> DBusError*) -->
>      <function-decl name='dbus_bus_release_name'
> mangled-name='dbus_bus_release_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1198' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_release_name'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1198' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1198' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1199' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
> @@ -748,7 +909,7 @@
>      <!-- int dbus_bus_request_name(DBusConnection*, const char*, unsigned
> int, DBusError*) -->
>      <function-decl name='dbus_bus_request_name'
> mangled-name='dbus_bus_request_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1112' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_request_name'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1112' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1112' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='1113' column='1'/>
>        <!-- parameter of type 'unsigned int' -->
> @@ -761,18 +922,18 @@
>      <!-- unsigned long int dbus_bus_get_unix_user(DBusConnection*, const
> char*, DBusError*) -->
>      <function-decl name='dbus_bus_get_unix_user'
> mangled-name='dbus_bus_get_unix_user'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='865' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_get_unix_user'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='865' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='865' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='866' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='867' column='1'/>
>        <!-- unsigned long int -->
> -      <return type-id='type-id-27'/>
> +      <return type-id='type-id-43'/>
>      </function-decl>
>      <!-- char* dbus_bus_get_id(DBusConnection*, DBusError*) -->
>      <function-decl name='dbus_bus_get_id' mangled-name='dbus_bus_get_id'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='948' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_get_id'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='948' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='948' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='949' column='1'/>
>        <!-- char* -->
> @@ -781,14 +942,14 @@
>      <!-- const char* dbus_bus_get_unique_name(DBusConnection*) -->
>      <function-decl name='dbus_bus_get_unique_name'
> mangled-name='dbus_bus_get_unique_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='815' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_get_unique_name'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='815' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='815' column='1'/>
>        <!-- const char* -->
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_bus_set_unique_name(DBusConnection*, const
> char*) -->
>      <function-decl name='dbus_bus_set_unique_name'
> mangled-name='dbus_bus_set_unique_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='766' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_set_unique_name'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='766' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='766' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='unique_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='767' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -797,7 +958,7 @@
>      <!-- dbus_bool_t dbus_bus_register(DBusConnection*, DBusError*) -->
>      <function-decl name='dbus_bus_register'
> mangled-name='dbus_bus_register'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='646' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_register'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='646' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='646' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='647' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -806,82 +967,411 @@
>      <!-- DBusConnection* dbus_bus_get_private(DBusBusType, DBusError*) -->
>      <function-decl name='dbus_bus_get_private'
> mangled-name='dbus_bus_get_private'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='590' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_get_private'>
>        <!-- parameter of type 'typedef DBusBusType' -->
> -      <parameter type-id='type-id-30' name='type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='590' column='1'/>
> +      <parameter type-id='type-id-46' name='type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='590' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='591' column='1'/>
>        <!-- DBusConnection* -->
> -      <return type-id='type-id-31'/>
> +      <return type-id='type-id-47'/>
>      </function-decl>
>      <!-- DBusConnection* dbus_bus_get(DBusBusType, DBusError*) -->
>      <function-decl name='dbus_bus_get' mangled-name='dbus_bus_get'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='558' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_bus_get'>
>        <!-- parameter of type 'typedef DBusBusType' -->
> -      <parameter type-id='type-id-30' name='type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='558' column='1'/>
> +      <parameter type-id='type-id-46' name='type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='558' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c'
> line='559' column='1'/>
>        <!-- DBusConnection* -->
> -      <return type-id='type-id-31'/>
> +      <return type-id='type-id-47'/>
>      </function-decl>
> +    <!-- DBusCMutex* -->
> +    <pointer-type-def type-id='type-id-49' size-in-bits='64'
> id='type-id-28'/>
> +    <!-- DBusCondVar* -->
> +    <pointer-type-def type-id='type-id-50' size-in-bits='64'
> id='type-id-29'/>
> +    <!-- DBusCounter* -->
> +    <pointer-type-def type-id='type-id-51' size-in-bits='64'
> id='type-id-31'/>
> +    <!-- DBusHashTable* -->
> +    <pointer-type-def type-id='type-id-52' size-in-bits='64'
> id='type-id-36'/>
> +    <!-- DBusMessage* -->
> +    <pointer-type-def type-id='type-id-53' size-in-bits='64'
> id='type-id-30'/>
> +    <!-- DBusObjectTree* -->
> +    <pointer-type-def type-id='type-id-54' size-in-bits='64'
> id='type-id-41'/>
> +    <!-- DBusRMutex* -->
> +    <pointer-type-def type-id='type-id-55' size-in-bits='64'
> id='type-id-27'/>
> +    <!-- DBusTimeoutList* -->
> +    <pointer-type-def type-id='type-id-56' size-in-bits='64'
> id='type-id-34'/>
> +    <!-- DBusTransport* -->
> +    <pointer-type-def type-id='type-id-57' size-in-bits='64'
> id='type-id-32'/>
> +    <!-- DBusWatchList* -->
> +    <pointer-type-def type-id='type-id-58' size-in-bits='64'
> id='type-id-33'/>
> +    <!-- typedef DBusAtomic DBusAtomic -->
> +    <typedef-decl name='DBusAtomic' type-id='type-id-59'
> filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-26'/>
> +    <!-- typedef DBusDataSlotList DBusDataSlotList -->
> +    <typedef-decl name='DBusDataSlotList' type-id='type-id-60'
> filepath='../dbus/dbus-dataslot.h' line='31' column='1' id='type-id-35'/>
> +    <!-- typedef __anonymous_enum__ DBusDispatchStatus -->
> +    <typedef-decl name='DBusDispatchStatus' type-id='type-id-61'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='84' column='1' id='type-id-40'/>
> +    <!-- typedef void (DBusConnection*, typedef DBusDispatchStatus,
> void*)* DBusDispatchStatusFunction -->
> +    <typedef-decl name='DBusDispatchStatusFunction' type-id='type-id-62'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='128' column='1' id='type-id-39'/>
> +    <!-- typedef void (void*)* DBusFreeFunction -->
> +    <typedef-decl name='DBusFreeFunction' type-id='type-id-63'
> filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-38'/>
> +    <!-- typedef void (void*)* DBusWakeupMainFunction -->
> +    <typedef-decl name='DBusWakeupMainFunction' type-id='type-id-63'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='135' column='1' id='type-id-37'/>
> +    <!-- enum __anonymous_enum__ -->
> +    <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='80' column='1' id='type-id-61'>
> +      <underlying-type type-id='type-id-42'/>
> +      <enumerator name='DBUS_DISPATCH_DATA_REMAINS' value='0'/>
> +      <enumerator name='DBUS_DISPATCH_COMPLETE' value='1'/>
> +      <enumerator name='DBUS_DISPATCH_NEED_MEMORY' value='2'/>
> +    </enum-decl>
> +    <!-- struct DBusAtomic -->
> +    <class-decl name='DBusAtomic' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-sysdeps.h' line='228'
> column='1' id='type-id-59'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- volatile dbus_int32_t DBusAtomic::value -->
> +        <var-decl name='value' type-id='type-id-64' visibility='default'
> filepath='../dbus/dbus-sysdeps.h' line='232' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <!-- struct DBusDataSlotList -->
> +    <class-decl name='DBusDataSlotList' size-in-bits='128'
> is-struct='yes' visibility='default' filepath='../dbus/dbus-dataslot.h'
> line='70' column='1' id='type-id-60'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- DBusDataSlot* DBusDataSlotList::slots -->
> +        <var-decl name='slots' type-id='type-id-65' visibility='default'
> filepath='../dbus/dbus-dataslot.h' line='71' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <!-- int DBusDataSlotList::n_slots -->
> +        <var-decl name='n_slots' type-id='type-id-2' visibility='default'
> filepath='../dbus/dbus-dataslot.h' line='72' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <!-- typedef DBusCMutex DBusCMutex -->
> +    <typedef-decl name='DBusCMutex' type-id='type-id-66'
> filepath='../dbus/dbus-threads-internal.h' line='45' column='1'
> id='type-id-49'/>
> +    <!-- typedef DBusCondVar DBusCondVar -->
> +    <typedef-decl name='DBusCondVar' type-id='type-id-67'
> filepath='../dbus/dbus-threads.h' line='43' column='1' id='type-id-50'/>
> +    <!-- typedef DBusCounter DBusCounter -->
> +    <typedef-decl name='DBusCounter' type-id='type-id-68'
> filepath='../dbus/dbus-resources.h' line='32' column='1' id='type-id-51'/>
> +    <!-- typedef DBusHashTable DBusHashTable -->
> +    <typedef-decl name='DBusHashTable' type-id='type-id-69'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-hash.h'
> line='59' column='1' id='type-id-52'/>
> +    <!-- typedef DBusMessage DBusMessage -->
> +    <typedef-decl name='DBusMessage' type-id='type-id-70'
> filepath='../dbus/dbus-message.h' line='44' column='1' id='type-id-53'/>
> +    <!-- typedef DBusObjectTree DBusObjectTree -->
> +    <typedef-decl name='DBusObjectTree' type-id='type-id-71'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-object-tree.h'
> line='30' column='1' id='type-id-54'/>
> +    <!-- typedef DBusRMutex DBusRMutex -->
> +    <typedef-decl name='DBusRMutex' type-id='type-id-72'
> filepath='../dbus/dbus-threads-internal.h' line='39' column='1'
> id='type-id-55'/>
> +    <!-- typedef DBusTimeoutList DBusTimeoutList -->
> +    <typedef-decl name='DBusTimeoutList' type-id='type-id-73'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h'
> line='38' column='1' id='type-id-56'/>
> +    <!-- typedef DBusTransport DBusTransport -->
> +    <typedef-decl name='DBusTransport' type-id='type-id-74'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport.h'
> line='33' column='1' id='type-id-57'/>
> +    <!-- typedef DBusWatchList DBusWatchList -->
> +    <typedef-decl name='DBusWatchList' type-id='type-id-75'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h'
> line='38' column='1' id='type-id-58'/>
> +    <!-- void (DBusConnection*, typedef DBusDispatchStatus, void*)* -->
> +    <pointer-type-def type-id='type-id-76' size-in-bits='64'
> id='type-id-62'/>
> +    <!-- void (void*)* -->
> +    <pointer-type-def type-id='type-id-77' size-in-bits='64'
> id='type-id-63'/>
> +    <!-- DBusDataSlot* -->
> +    <pointer-type-def type-id='type-id-78' size-in-bits='64'
> id='type-id-65'/>
> +    <!-- struct DBusCMutex -->
> +    <class-decl name='DBusCMutex' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-66'/>
> +    <!-- struct DBusCondVar -->
> +    <class-decl name='DBusCondVar' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-67'/>
> +    <!-- struct DBusCounter -->
> +    <class-decl name='DBusCounter' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-68'/>
> +    <!-- struct DBusHashTable -->
> +    <class-decl name='DBusHashTable' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-69'/>
> +    <!-- struct DBusMessage -->
> +    <class-decl name='DBusMessage' size-in-bits='1472' is-struct='yes'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='100' column='1' id='type-id-70'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- DBusAtomic DBusMessage::refcount -->
> +        <var-decl name='refcount' type-id='type-id-26'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='101' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <!-- DBusHeader DBusMessage::header -->
> +        <var-decl name='header' type-id='type-id-79' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='103' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='640'>
> +        <!-- DBusString DBusMessage::body -->
> +        <var-decl name='body' type-id='type-id-7' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='105' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='31'>
> +        <!-- unsigned int DBusMessage::locked -->
> +        <var-decl name='locked' type-id='type-id-3' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='107' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='30'>
> +        <!-- unsigned int DBusMessage::in_cache -->
> +        <var-decl name='in_cache' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='110' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='896'>
> +        <!-- DBusList* DBusMessage::counters -->
> +        <var-decl name='counters' type-id='type-id-8'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='113' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='960'>
> +        <!-- long int DBusMessage::size_counter_delta -->
> +        <var-decl name='size_counter_delta' type-id='type-id-80'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='114' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='11'>
> +        <!-- dbus_uint32_t DBusMessage::changed_stamp -->
> +        <var-decl name='changed_stamp' type-id='type-id-16'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='116' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1088'>
> +        <!-- DBusDataSlotList DBusMessage::slot_list -->
> +        <var-decl name='slot_list' type-id='type-id-35'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='118' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1216'>
> +        <!-- int DBusMessage::generation -->
> +        <var-decl name='generation' type-id='type-id-2'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='121' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1280'>
> +        <!-- int* DBusMessage::unix_fds -->
> +        <var-decl name='unix_fds' type-id='type-id-24'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='125' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1344'>
> +        <!-- unsigned int DBusMessage::n_unix_fds -->
> +        <var-decl name='n_unix_fds' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='129' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1376'>
> +        <!-- unsigned int DBusMessage::n_unix_fds_allocated -->
> +        <var-decl name='n_unix_fds_allocated' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='130' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='1408'>
> +        <!-- long int DBusMessage::unix_fd_counter_delta -->
> +        <var-decl name='unix_fd_counter_delta' type-id='type-id-80'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='132' column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <!-- struct DBusObjectTree -->
> +    <class-decl name='DBusObjectTree' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-71'/>
> +    <!-- struct DBusRMutex -->
> +    <class-decl name='DBusRMutex' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-72'/>
> +    <!-- struct DBusTimeoutList -->
> +    <class-decl name='DBusTimeoutList' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-73'/>
> +    <!-- struct DBusTransport -->
> +    <class-decl name='DBusTransport' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-74'/>
> +    <!-- struct DBusWatchList -->
> +    <class-decl name='DBusWatchList' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-75'/>
> +    <!-- volatile dbus_int32_t -->
> +    <qualified-type-def type-id='type-id-81' volatile='yes'
> id='type-id-64'/>
> +    <!-- long int -->
> +    <type-decl name='long int' size-in-bits='64' id='type-id-80'/>
> +    <!-- typedef DBusDataSlot DBusDataSlot -->
> +    <typedef-decl name='DBusDataSlot' type-id='type-id-82'
> filepath='../dbus/dbus-dataslot.h' line='34' column='1' id='type-id-78'/>
> +    <!-- typedef DBusHeader DBusHeader -->
> +    <typedef-decl name='DBusHeader' type-id='type-id-83'
> filepath='../dbus/dbus-marshal-header.h' line='30' column='1'
> id='type-id-79'/>
> +    <!-- typedef int dbus_int32_t -->
> +    <typedef-decl name='dbus_int32_t' type-id='type-id-2'
> filepath='../dbus/dbus-arch-deps.h' line='42' column='1' id='type-id-81'/>
> +    <!-- struct DBusDataSlot -->
> +    <class-decl name='DBusDataSlot' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-dataslot.h' line='37'
> column='1' id='type-id-82'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- void* DBusDataSlot::data -->
> +        <var-decl name='data' type-id='type-id-10' visibility='default'
> filepath='../dbus/dbus-dataslot.h' line='38' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <!-- DBusFreeFunction DBusDataSlot::free_data_func -->
> +        <var-decl name='free_data_func' type-id='type-id-38'
> visibility='default' filepath='../dbus/dbus-dataslot.h' line='39'
> column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <!-- struct DBusHeader -->
> +    <class-decl name='DBusHeader' size-in-bits='576' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='48'
> column='1' id='type-id-83'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- DBusString DBusHeader::data -->
> +        <var-decl name='data' type-id='type-id-7' visibility='default'
> filepath='../dbus/dbus-marshal-header.h' line='49' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='192'>
> +        <!-- DBusHeaderField DBusHeader::fields[10] -->
> +        <var-decl name='fields' type-id='type-id-84' visibility='default'
> filepath='../dbus/dbus-marshal-header.h' line='54' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='29'>
> +        <!-- dbus_uint32_t DBusHeader::padding -->
> +        <var-decl name='padding' type-id='type-id-16'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='58'
> column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='21'>
> +        <!-- dbus_uint32_t DBusHeader::byte_order -->
> +        <var-decl name='byte_order' type-id='type-id-16'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='59'
> column='1'/>
> +      </data-member>
> +    </class-decl>
> +    <!-- DBusHeaderField[10] -->
> +    <array-type-def dimensions='1' type-id='type-id-85'
> size-in-bits='320' id='type-id-84'>
> +      <!-- <anonymous range>[10] -->
> +      <subrange length='10' type-id='type-id-43' id='type-id-86'/>
> +    </array-type-def>
> +    <!-- typedef DBusHeaderField DBusHeaderField -->
> +    <typedef-decl name='DBusHeaderField' type-id='type-id-87'
> filepath='../dbus/dbus-marshal-header.h' line='31' column='1'
> id='type-id-85'/>
> +    <!-- struct DBusHeaderField -->
> +    <class-decl name='DBusHeaderField' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='40'
> column='1' id='type-id-87'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- int DBusHeaderField::value_pos -->
> +        <var-decl name='value_pos' type-id='type-id-2'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='41'
> column='1'/>
> +      </data-member>
> +    </class-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-connection.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- DBusHeaderField[10] -->
> -    <array-type-def dimensions='1' type-id='type-id-33'
> size-in-bits='320' id='type-id-34'>
> +    <array-type-def dimensions='1' type-id='type-id-85'
> size-in-bits='320' id='type-id-84'>
>        <!-- <anonymous range>[10] -->
> -      <subrange length='10' type-id='type-id-27' id='type-id-35'/>
> +      <subrange length='10' type-id='type-id-43' id='type-id-86'/>
>      </array-type-def>
>      <!-- struct DBusCMutex -->
> -    <class-decl name='DBusCMutex' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-36'/>
> +    <class-decl name='DBusCMutex' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-66'/>
>      <!-- struct DBusCondVar -->
> -    <class-decl name='DBusCondVar' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-37'/>
> +    <class-decl name='DBusCondVar' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-67'/>
>      <!-- struct DBusCounter -->
> -    <class-decl name='DBusCounter' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-38'/>
> +    <class-decl name='DBusCounter' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-68'/>
>      <!-- struct DBusHashTable -->
> -    <class-decl name='DBusHashTable' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-39'/>
> +    <class-decl name='DBusHashTable' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-69'/>
>      <!-- struct DBusObjectTree -->
> -    <class-decl name='DBusObjectTree' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-40'/>
> +    <class-decl name='DBusObjectTree' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-71'/>
>      <!-- struct DBusPendingCall -->
> -    <class-decl name='DBusPendingCall' size-in-bits='576' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-41'/>
> +    <class-decl name='DBusPendingCall' size-in-bits='576' is-struct='yes'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='63' column='1' id='type-id-88'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- DBusAtomic DBusPendingCall::refcount -->
> +        <var-decl name='refcount' type-id='type-id-26'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='64' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <!-- DBusDataSlotList DBusPendingCall::slot_list -->
> +        <var-decl name='slot_list' type-id='type-id-35'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='66' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='192'>
> +        <!-- DBusPendingCallNotifyFunction DBusPendingCall::function -->
> +        <var-decl name='function' type-id='type-id-89'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='68' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='256'>
> +        <!-- DBusConnection* DBusPendingCall::connection -->
> +        <var-decl name='connection' type-id='type-id-47'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='70' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='320'>
> +        <!-- DBusMessage* DBusPendingCall::reply -->
> +        <var-decl name='reply' type-id='type-id-30' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='71' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='384'>
> +        <!-- DBusTimeout* DBusPendingCall::timeout -->
> +        <var-decl name='timeout' type-id='type-id-90'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='72' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='448'>
> +        <!-- DBusList* DBusPendingCall::timeout_link -->
> +        <var-decl name='timeout_link' type-id='type-id-8'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='74' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='512'>
> +        <!-- dbus_uint32_t DBusPendingCall::reply_serial -->
> +        <var-decl name='reply_serial' type-id='type-id-16'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='76' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='31'>
> +        <!-- unsigned int DBusPendingCall::completed -->
> +        <var-decl name='completed' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='78' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='30'>
> +        <!-- unsigned int DBusPendingCall::timeout_added -->
> +        <var-decl name='timeout_added' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='79' column='1'/>
> +      </data-member>
> +    </class-decl>
>      <!-- struct DBusRMutex -->
> -    <class-decl name='DBusRMutex' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-42'/>
> +    <class-decl name='DBusRMutex' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-72'/>
>      <!-- struct DBusTimeout -->
> -    <class-decl name='DBusTimeout' size-in-bits='448' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-43'/>
> +    <class-decl name='DBusTimeout' size-in-bits='448' is-struct='yes'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='41' column='1' id='type-id-91'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- int DBusTimeout::refcount -->
> +        <var-decl name='refcount' type-id='type-id-2'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='42' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='32'>
> +        <!-- int DBusTimeout::interval -->
> +        <var-decl name='interval' type-id='type-id-2'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='43' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <!-- DBusTimeoutHandler DBusTimeout::handler -->
> +        <var-decl name='handler' type-id='type-id-92'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='45' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='128'>
> +        <!-- void* DBusTimeout::handler_data -->
> +        <var-decl name='handler_data' type-id='type-id-10'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='46' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='192'>
> +        <!-- DBusFreeFunction DBusTimeout::free_handler_data_function -->
> +        <var-decl name='free_handler_data_function' type-id='type-id-38'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='47' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='256'>
> +        <!-- void* DBusTimeout::data -->
> +        <var-decl name='data' type-id='type-id-10' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='49' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='320'>
> +        <!-- DBusFreeFunction DBusTimeout::free_data_function -->
> +        <var-decl name='free_data_function' type-id='type-id-38'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='50' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='31'>
> +        <!-- unsigned int DBusTimeout::enabled -->
> +        <var-decl name='enabled' type-id='type-id-3' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='51' column='1'/>
> +      </data-member>
> +    </class-decl>
>      <!-- struct DBusTimeoutList -->
> -    <class-decl name='DBusTimeoutList' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-44'/>
> +    <class-decl name='DBusTimeoutList' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-73'/>
>      <!-- struct DBusTransport -->
> -    <class-decl name='DBusTransport' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-45'/>
> +    <class-decl name='DBusTransport' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-74'/>
>      <!-- struct DBusWatch -->
> -    <class-decl name='DBusWatch' size-in-bits='512' is-struct='yes'
> visibility='default' is-declaration-only='yes' id='type-id-46'/>
> +    <class-decl name='DBusWatch' size-in-bits='512' is-struct='yes'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='41' column='1' id='type-id-93'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- int DBusWatch::refcount -->
> +        <var-decl name='refcount' type-id='type-id-2'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='42' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='32'>
> +        <!-- int DBusWatch::fd -->
> +        <var-decl name='fd' type-id='type-id-2' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='43' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <!-- unsigned int DBusWatch::flags -->
> +        <var-decl name='flags' type-id='type-id-3' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='44' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='128'>
> +        <!-- DBusWatchHandler DBusWatch::handler -->
> +        <var-decl name='handler' type-id='type-id-94'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='46' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='192'>
> +        <!-- void* DBusWatch::handler_data -->
> +        <var-decl name='handler_data' type-id='type-id-10'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='47' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='256'>
> +        <!-- DBusFreeFunction DBusWatch::free_handler_data_function -->
> +        <var-decl name='free_handler_data_function' type-id='type-id-38'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='48' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='320'>
> +        <!-- void* DBusWatch::data -->
> +        <var-decl name='data' type-id='type-id-10' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='50' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='384'>
> +        <!-- DBusFreeFunction DBusWatch::free_data_function -->
> +        <var-decl name='free_data_function' type-id='type-id-38'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='51' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='31'>
> +        <!-- unsigned int DBusWatch::enabled -->
> +        <var-decl name='enabled' type-id='type-id-3' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='52' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='30'>
> +        <!-- unsigned int DBusWatch::oom_last_time -->
> +        <var-decl name='oom_last_time' type-id='type-id-3'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='53' column='1'/>
> +      </data-member>
> +    </class-decl>
>      <!-- struct DBusWatchList -->
> -    <class-decl name='DBusWatchList' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-47'/>
> +    <class-decl name='DBusWatchList' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-75'/>
>      <!-- long int -->
> -    <type-decl name='long int' size-in-bits='64' id='type-id-48'/>
> +    <type-decl name='long int' size-in-bits='64' id='type-id-80'/>
>      <!-- typedef DBusAtomic DBusAtomic -->
> -    <typedef-decl name='DBusAtomic' type-id='type-id-49'
> filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-50'/>
> +    <typedef-decl name='DBusAtomic' type-id='type-id-59'
> filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-26'/>
>      <!-- struct DBusAtomic -->
> -    <class-decl name='DBusAtomic' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-sysdeps.h' line='228'
> column='1' id='type-id-49'>
> +    <class-decl name='DBusAtomic' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-sysdeps.h' line='228'
> column='1' id='type-id-59'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- volatile dbus_int32_t DBusAtomic::value -->
> -        <var-decl name='value' type-id='type-id-51' visibility='default'
> filepath='../dbus/dbus-sysdeps.h' line='232' column='1'/>
> +        <var-decl name='value' type-id='type-id-64' visibility='default'
> filepath='../dbus/dbus-sysdeps.h' line='232' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef int dbus_int32_t -->
> -    <typedef-decl name='dbus_int32_t' type-id='type-id-2'
> filepath='../dbus/dbus-arch-deps.h' line='42' column='1' id='type-id-52'/>
> +    <typedef-decl name='dbus_int32_t' type-id='type-id-2'
> filepath='../dbus/dbus-arch-deps.h' line='42' column='1' id='type-id-81'/>
>      <!-- typedef DBusRMutex DBusRMutex -->
> -    <typedef-decl name='DBusRMutex' type-id='type-id-42'
> filepath='../dbus/dbus-threads-internal.h' line='39' column='1'
> id='type-id-53'/>
> +    <typedef-decl name='DBusRMutex' type-id='type-id-72'
> filepath='../dbus/dbus-threads-internal.h' line='39' column='1'
> id='type-id-55'/>
>      <!-- typedef DBusCMutex DBusCMutex -->
> -    <typedef-decl name='DBusCMutex' type-id='type-id-36'
> filepath='../dbus/dbus-threads-internal.h' line='45' column='1'
> id='type-id-54'/>
> +    <typedef-decl name='DBusCMutex' type-id='type-id-66'
> filepath='../dbus/dbus-threads-internal.h' line='45' column='1'
> id='type-id-49'/>
>      <!-- typedef DBusCondVar DBusCondVar -->
> -    <typedef-decl name='DBusCondVar' type-id='type-id-37'
> filepath='../dbus/dbus-threads.h' line='43' column='1' id='type-id-55'/>
> +    <typedef-decl name='DBusCondVar' type-id='type-id-67'
> filepath='../dbus/dbus-threads.h' line='43' column='1' id='type-id-50'/>
>      <!-- typedef DBusMessage DBusMessage -->
> -    <typedef-decl name='DBusMessage' type-id='type-id-56'
> filepath='../dbus/dbus-message.h' line='44' column='1' id='type-id-57'/>
> +    <typedef-decl name='DBusMessage' type-id='type-id-70'
> filepath='../dbus/dbus-message.h' line='44' column='1' id='type-id-53'/>
>      <!-- struct DBusMessage -->
> -    <class-decl name='DBusMessage' size-in-bits='1472' is-struct='yes'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='100' column='1' id='type-id-56'>
> +    <class-decl name='DBusMessage' size-in-bits='1472' is-struct='yes'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='100' column='1' id='type-id-70'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- DBusAtomic DBusMessage::refcount -->
> -        <var-decl name='refcount' type-id='type-id-50'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='101' column='1'/>
> +        <var-decl name='refcount' type-id='type-id-26'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='101' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- DBusHeader DBusMessage::header -->
> -        <var-decl name='header' type-id='type-id-58' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='103' column='1'/>
> +        <var-decl name='header' type-id='type-id-79' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='103' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
>          <!-- DBusString DBusMessage::body -->
> @@ -901,7 +1391,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
>          <!-- long int DBusMessage::size_counter_delta -->
> -        <var-decl name='size_counter_delta' type-id='type-id-48'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='114' column='1'/>
> +        <var-decl name='size_counter_delta' type-id='type-id-80'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='114' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='11'>
>          <!-- dbus_uint32_t DBusMessage::changed_stamp -->
> @@ -909,7 +1399,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
>          <!-- DBusDataSlotList DBusMessage::slot_list -->
> -        <var-decl name='slot_list' type-id='type-id-59'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='118' column='1'/>
> +        <var-decl name='slot_list' type-id='type-id-35'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='118' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1216'>
>          <!-- int DBusMessage::generation -->
> @@ -929,20 +1419,20 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1408'>
>          <!-- long int DBusMessage::unix_fd_counter_delta -->
> -        <var-decl name='unix_fd_counter_delta' type-id='type-id-48'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='132' column='1'/>
> +        <var-decl name='unix_fd_counter_delta' type-id='type-id-80'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h'
> line='132' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusHeader DBusHeader -->
> -    <typedef-decl name='DBusHeader' type-id='type-id-60'
> filepath='../dbus/dbus-marshal-header.h' line='30' column='1'
> id='type-id-58'/>
> +    <typedef-decl name='DBusHeader' type-id='type-id-83'
> filepath='../dbus/dbus-marshal-header.h' line='30' column='1'
> id='type-id-79'/>
>      <!-- struct DBusHeader -->
> -    <class-decl name='DBusHeader' size-in-bits='576' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='48'
> column='1' id='type-id-60'>
> +    <class-decl name='DBusHeader' size-in-bits='576' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='48'
> column='1' id='type-id-83'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- DBusString DBusHeader::data -->
>          <var-decl name='data' type-id='type-id-7' visibility='default'
> filepath='../dbus/dbus-marshal-header.h' line='49' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <!-- DBusHeaderField DBusHeader::fields[10] -->
> -        <var-decl name='fields' type-id='type-id-34' visibility='default'
> filepath='../dbus/dbus-marshal-header.h' line='54' column='1'/>
> +        <var-decl name='fields' type-id='type-id-84' visibility='default'
> filepath='../dbus/dbus-marshal-header.h' line='54' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='29'>
>          <!-- dbus_uint32_t DBusHeader::padding -->
> @@ -954,21 +1444,21 @@
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusHeaderField DBusHeaderField -->
> -    <typedef-decl name='DBusHeaderField' type-id='type-id-61'
> filepath='../dbus/dbus-marshal-header.h' line='31' column='1'
> id='type-id-33'/>
> +    <typedef-decl name='DBusHeaderField' type-id='type-id-87'
> filepath='../dbus/dbus-marshal-header.h' line='31' column='1'
> id='type-id-85'/>
>      <!-- struct DBusHeaderField -->
> -    <class-decl name='DBusHeaderField' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='40'
> column='1' id='type-id-61'>
> +    <class-decl name='DBusHeaderField' size-in-bits='32' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='40'
> column='1' id='type-id-87'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- int DBusHeaderField::value_pos -->
>          <var-decl name='value_pos' type-id='type-id-2'
> visibility='default' filepath='../dbus/dbus-marshal-header.h' line='41'
> column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusDataSlotList DBusDataSlotList -->
> -    <typedef-decl name='DBusDataSlotList' type-id='type-id-62'
> filepath='../dbus/dbus-dataslot.h' line='31' column='1' id='type-id-59'/>
> +    <typedef-decl name='DBusDataSlotList' type-id='type-id-60'
> filepath='../dbus/dbus-dataslot.h' line='31' column='1' id='type-id-35'/>
>      <!-- struct DBusDataSlotList -->
> -    <class-decl name='DBusDataSlotList' size-in-bits='128'
> is-struct='yes' visibility='default' filepath='../dbus/dbus-dataslot.h'
> line='70' column='1' id='type-id-62'>
> +    <class-decl name='DBusDataSlotList' size-in-bits='128'
> is-struct='yes' visibility='default' filepath='../dbus/dbus-dataslot.h'
> line='70' column='1' id='type-id-60'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- DBusDataSlot* DBusDataSlotList::slots -->
> -        <var-decl name='slots' type-id='type-id-63' visibility='default'
> filepath='../dbus/dbus-dataslot.h' line='71' column='1'/>
> +        <var-decl name='slots' type-id='type-id-65' visibility='default'
> filepath='../dbus/dbus-dataslot.h' line='71' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int DBusDataSlotList::n_slots -->
> @@ -976,116 +1466,116 @@
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusDataSlot DBusDataSlot -->
> -    <typedef-decl name='DBusDataSlot' type-id='type-id-64'
> filepath='../dbus/dbus-dataslot.h' line='34' column='1' id='type-id-65'/>
> +    <typedef-decl name='DBusDataSlot' type-id='type-id-82'
> filepath='../dbus/dbus-dataslot.h' line='34' column='1' id='type-id-78'/>
>      <!-- struct DBusDataSlot -->
> -    <class-decl name='DBusDataSlot' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-dataslot.h' line='37'
> column='1' id='type-id-64'>
> +    <class-decl name='DBusDataSlot' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-dataslot.h' line='37'
> column='1' id='type-id-82'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- void* DBusDataSlot::data -->
>          <var-decl name='data' type-id='type-id-10' visibility='default'
> filepath='../dbus/dbus-dataslot.h' line='38' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- DBusFreeFunction DBusDataSlot::free_data_func -->
> -        <var-decl name='free_data_func' type-id='type-id-66'
> visibility='default' filepath='../dbus/dbus-dataslot.h' line='39'
> column='1'/>
> +        <var-decl name='free_data_func' type-id='type-id-38'
> visibility='default' filepath='../dbus/dbus-dataslot.h' line='39'
> column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef void (void*)* DBusFreeFunction -->
> -    <typedef-decl name='DBusFreeFunction' type-id='type-id-67'
> filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-66'/>
> +    <typedef-decl name='DBusFreeFunction' type-id='type-id-63'
> filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-38'/>
>      <!-- typedef DBusCounter DBusCounter -->
> -    <typedef-decl name='DBusCounter' type-id='type-id-38'
> filepath='../dbus/dbus-resources.h' line='32' column='1' id='type-id-68'/>
> +    <typedef-decl name='DBusCounter' type-id='type-id-68'
> filepath='../dbus/dbus-resources.h' line='32' column='1' id='type-id-51'/>
>      <!-- typedef DBusTransport DBusTransport -->
> -    <typedef-decl name='DBusTransport' type-id='type-id-45'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport.h'
> line='33' column='1' id='type-id-69'/>
> +    <typedef-decl name='DBusTransport' type-id='type-id-74'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport.h'
> line='33' column='1' id='type-id-57'/>
>      <!-- typedef DBusWatchList DBusWatchList -->
> -    <typedef-decl name='DBusWatchList' type-id='type-id-47'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h'
> line='38' column='1' id='type-id-70'/>
> +    <typedef-decl name='DBusWatchList' type-id='type-id-75'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h'
> line='38' column='1' id='type-id-58'/>
>      <!-- typedef DBusTimeoutList DBusTimeoutList -->
> -    <typedef-decl name='DBusTimeoutList' type-id='type-id-44'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h'
> line='38' column='1' id='type-id-71'/>
> +    <typedef-decl name='DBusTimeoutList' type-id='type-id-73'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h'
> line='38' column='1' id='type-id-56'/>
>      <!-- typedef DBusHashTable DBusHashTable -->
> -    <typedef-decl name='DBusHashTable' type-id='type-id-39'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-hash.h'
> line='59' column='1' id='type-id-72'/>
> +    <typedef-decl name='DBusHashTable' type-id='type-id-69'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-hash.h'
> line='59' column='1' id='type-id-52'/>
>      <!-- typedef void (void*)* DBusWakeupMainFunction -->
> -    <typedef-decl name='DBusWakeupMainFunction' type-id='type-id-67'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='135' column='1' id='type-id-73'/>
> +    <typedef-decl name='DBusWakeupMainFunction' type-id='type-id-63'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='135' column='1' id='type-id-37'/>
>      <!-- typedef void (DBusConnection*, typedef DBusDispatchStatus,
> void*)* DBusDispatchStatusFunction -->
> -    <typedef-decl name='DBusDispatchStatusFunction' type-id='type-id-74'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='128' column='1' id='type-id-75'/>
> +    <typedef-decl name='DBusDispatchStatusFunction' type-id='type-id-62'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='128' column='1' id='type-id-39'/>
>      <!-- typedef __anonymous_enum__ DBusDispatchStatus -->
> -    <typedef-decl name='DBusDispatchStatus' type-id='type-id-76'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='84' column='1' id='type-id-77'/>
> +    <typedef-decl name='DBusDispatchStatus' type-id='type-id-61'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='84' column='1' id='type-id-40'/>
>      <!-- enum __anonymous_enum__ -->
> -    <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='80' column='1' id='type-id-76'>
> -      <underlying-type type-id='type-id-26'/>
> +    <enum-decl name='__anonymous_enum__' is-anonymous='yes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='80' column='1' id='type-id-61'>
> +      <underlying-type type-id='type-id-42'/>
>        <enumerator name='DBUS_DISPATCH_DATA_REMAINS' value='0'/>
>        <enumerator name='DBUS_DISPATCH_COMPLETE' value='1'/>
>        <enumerator name='DBUS_DISPATCH_NEED_MEMORY' value='2'/>
>      </enum-decl>
>      <!-- typedef DBusObjectTree DBusObjectTree -->
> -    <typedef-decl name='DBusObjectTree' type-id='type-id-40'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-object-tree.h'
> line='30' column='1' id='type-id-78'/>
> +    <typedef-decl name='DBusObjectTree' type-id='type-id-71'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-object-tree.h'
> line='30' column='1' id='type-id-54'/>
>      <!-- typedef DBusObjectPathVTable DBusObjectPathVTable -->
> -    <typedef-decl name='DBusObjectPathVTable' type-id='type-id-79'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='53' column='1' id='type-id-80'/>
> +    <typedef-decl name='DBusObjectPathVTable' type-id='type-id-95'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='53' column='1' id='type-id-96'/>
>      <!-- struct DBusObjectPathVTable -->
> -    <class-decl name='DBusObjectPathVTable' size-in-bits='384'
> is-struct='yes' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='385' column='1' id='type-id-79'>
> +    <class-decl name='DBusObjectPathVTable' size-in-bits='384'
> is-struct='yes' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='385' column='1' id='type-id-95'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- DBusObjectPathUnregisterFunction
> DBusObjectPathVTable::unregister_function -->
> -        <var-decl name='unregister_function' type-id='type-id-81'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='386' column='1'/>
> +        <var-decl name='unregister_function' type-id='type-id-97'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='386' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- DBusObjectPathMessageFunction
> DBusObjectPathVTable::message_function -->
> -        <var-decl name='message_function' type-id='type-id-82'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='387' column='1'/>
> +        <var-decl name='message_function' type-id='type-id-98'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='387' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad1 -->
> -        <var-decl name='dbus_internal_pad1' type-id='type-id-67'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='389' column='1'/>
> +        <var-decl name='dbus_internal_pad1' type-id='type-id-63'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='389' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad2 -->
> -        <var-decl name='dbus_internal_pad2' type-id='type-id-67'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='390' column='1'/>
> +        <var-decl name='dbus_internal_pad2' type-id='type-id-63'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='390' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad3 -->
> -        <var-decl name='dbus_internal_pad3' type-id='type-id-67'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='391' column='1'/>
> +        <var-decl name='dbus_internal_pad3' type-id='type-id-63'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='391' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad4 -->
> -        <var-decl name='dbus_internal_pad4' type-id='type-id-67'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='392' column='1'/>
> +        <var-decl name='dbus_internal_pad4' type-id='type-id-63'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='392' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef void (DBusConnection*, void*)*
> DBusObjectPathUnregisterFunction -->
> -    <typedef-decl name='DBusObjectPathUnregisterFunction'
> type-id='type-id-83'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='367' column='1' id='type-id-81'/>
> +    <typedef-decl name='DBusObjectPathUnregisterFunction'
> type-id='type-id-99'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='367' column='1' id='type-id-97'/>
>      <!-- typedef typedef DBusHandlerResult (DBusConnection*,
> DBusMessage*, void*)* DBusObjectPathMessageFunction -->
> -    <typedef-decl name='DBusObjectPathMessageFunction'
> type-id='type-id-84'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='374' column='1' id='type-id-82'/>
> +    <typedef-decl name='DBusObjectPathMessageFunction'
> type-id='type-id-100'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='374' column='1' id='type-id-98'/>
>      <!-- typedef __anonymous_enum__1 DBusHandlerResult -->
> -    <typedef-decl name='DBusHandlerResult' type-id='type-id-85'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-shared.h'
> line='71' column='1' id='type-id-86'/>
> +    <typedef-decl name='DBusHandlerResult' type-id='type-id-101'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-shared.h'
> line='71' column='1' id='type-id-102'/>
>      <!-- enum __anonymous_enum__1 -->
> -    <enum-decl name='__anonymous_enum__1' is-anonymous='yes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-shared.h'
> line='67' column='1' id='type-id-85'>
> -      <underlying-type type-id='type-id-26'/>
> +    <enum-decl name='__anonymous_enum__1' is-anonymous='yes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-shared.h'
> line='67' column='1' id='type-id-101'>
> +      <underlying-type type-id='type-id-42'/>
>        <enumerator name='DBUS_HANDLER_RESULT_HANDLED' value='0'/>
>        <enumerator name='DBUS_HANDLER_RESULT_NOT_YET_HANDLED' value='1'/>
>        <enumerator name='DBUS_HANDLER_RESULT_NEED_MEMORY' value='2'/>
>      </enum-decl>
>      <!-- typedef typedef DBusHandlerResult (DBusConnection*,
> DBusMessage*, void*)* DBusHandleMessageFunction -->
> -    <typedef-decl name='DBusHandleMessageFunction' type-id='type-id-84'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='169' column='1' id='type-id-87'/>
> +    <typedef-decl name='DBusHandleMessageFunction' type-id='type-id-100'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='169' column='1' id='type-id-103'/>
>      <!-- typedef typedef dbus_bool_t (DBusConnection*, const char*,
> void*)* DBusAllowWindowsUserFunction -->
> -    <typedef-decl name='DBusAllowWindowsUserFunction'
> type-id='type-id-88'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='153' column='1' id='type-id-89'/>
> +    <typedef-decl name='DBusAllowWindowsUserFunction'
> type-id='type-id-104'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='153' column='1' id='type-id-105'/>
>      <!-- typedef typedef dbus_bool_t (DBusConnection*, unsigned long int,
> void*)* DBusAllowUnixUserFunction -->
> -    <typedef-decl name='DBusAllowUnixUserFunction' type-id='type-id-90'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='143' column='1' id='type-id-91'/>
> +    <typedef-decl name='DBusAllowUnixUserFunction' type-id='type-id-106'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='143' column='1' id='type-id-107'/>
>      <!-- typedef typedef dbus_bool_t (DBusTimeout*, void*)*
> DBusAddTimeoutFunction -->
> -    <typedef-decl name='DBusAddTimeoutFunction' type-id='type-id-92'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='110' column='1' id='type-id-93'/>
> +    <typedef-decl name='DBusAddTimeoutFunction' type-id='type-id-108'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='110' column='1' id='type-id-109'/>
>      <!-- typedef DBusTimeout DBusTimeout -->
> -    <typedef-decl name='DBusTimeout' type-id='type-id-43'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='45' column='1' id='type-id-94'/>
> +    <typedef-decl name='DBusTimeout' type-id='type-id-91'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='45' column='1' id='type-id-110'/>
>      <!-- typedef void (DBusTimeout*, void*)* DBusRemoveTimeoutFunction -->
> -    <typedef-decl name='DBusRemoveTimeoutFunction' type-id='type-id-95'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='123' column='1' id='type-id-96'/>
> +    <typedef-decl name='DBusRemoveTimeoutFunction' type-id='type-id-111'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='123' column='1' id='type-id-112'/>
>      <!-- typedef void (DBusTimeout*, void*)* DBusTimeoutToggledFunction
> -->
> -    <typedef-decl name='DBusTimeoutToggledFunction' type-id='type-id-95'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='117' column='1' id='type-id-97'/>
> +    <typedef-decl name='DBusTimeoutToggledFunction' type-id='type-id-111'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='117' column='1' id='type-id-113'/>
>      <!-- typedef typedef dbus_bool_t (DBusWatch*, void*)*
> DBusAddWatchFunction -->
> -    <typedef-decl name='DBusAddWatchFunction' type-id='type-id-98'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='91' column='1' id='type-id-99'/>
> +    <typedef-decl name='DBusAddWatchFunction' type-id='type-id-114'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='91' column='1' id='type-id-115'/>
>      <!-- typedef DBusWatch DBusWatch -->
> -    <typedef-decl name='DBusWatch' type-id='type-id-46'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='43' column='1' id='type-id-100'/>
> +    <typedef-decl name='DBusWatch' type-id='type-id-93'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='43' column='1' id='type-id-116'/>
>      <!-- typedef void (DBusWatch*, void*)* DBusRemoveWatchFunction -->
> -    <typedef-decl name='DBusRemoveWatchFunction' type-id='type-id-101'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='103' column='1' id='type-id-102'/>
> +    <typedef-decl name='DBusRemoveWatchFunction' type-id='type-id-117'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='103' column='1' id='type-id-118'/>
>      <!-- typedef void (DBusWatch*, void*)* DBusWatchToggledFunction -->
> -    <typedef-decl name='DBusWatchToggledFunction' type-id='type-id-101'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='97' column='1' id='type-id-103'/>
> +    <typedef-decl name='DBusWatchToggledFunction' type-id='type-id-117'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='97' column='1' id='type-id-119'/>
>      <!-- typedef DBusPreallocatedSend DBusPreallocatedSend -->
> -    <typedef-decl name='DBusPreallocatedSend' type-id='type-id-104'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='47' column='1' id='type-id-105'/>
> +    <typedef-decl name='DBusPreallocatedSend' type-id='type-id-120'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='47' column='1' id='type-id-121'/>
>      <!-- struct DBusPreallocatedSend -->
> -    <class-decl name='DBusPreallocatedSend' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='241' column='1' id='type-id-104'>
> +    <class-decl name='DBusPreallocatedSend' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='241' column='1' id='type-id-120'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- DBusConnection* DBusPreallocatedSend::connection -->
> -        <var-decl name='connection' type-id='type-id-31'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='242' column='1'/>
> +        <var-decl name='connection' type-id='type-id-47'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='242' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- DBusList* DBusPreallocatedSend::queue_link -->
> @@ -1097,75 +1587,75 @@
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusPendingCall DBusPendingCall -->
> -    <typedef-decl name='DBusPendingCall' type-id='type-id-41'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='49' column='1' id='type-id-106'/>
> +    <typedef-decl name='DBusPendingCall' type-id='type-id-88'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h'
> line='49' column='1' id='type-id-122'/>
>      <!-- DBusCMutex* -->
> -    <pointer-type-def type-id='type-id-54' size-in-bits='64'
> id='type-id-107'/>
> +    <pointer-type-def type-id='type-id-49' size-in-bits='64'
> id='type-id-28'/>
>      <!-- DBusCondVar* -->
> -    <pointer-type-def type-id='type-id-55' size-in-bits='64'
> id='type-id-108'/>
> +    <pointer-type-def type-id='type-id-50' size-in-bits='64'
> id='type-id-29'/>
>      <!-- DBusCounter* -->
> -    <pointer-type-def type-id='type-id-68' size-in-bits='64'
> id='type-id-109'/>
> +    <pointer-type-def type-id='type-id-51' size-in-bits='64'
> id='type-id-31'/>
>      <!-- DBusDataSlot* -->
> -    <pointer-type-def type-id='type-id-65' size-in-bits='64'
> id='type-id-63'/>
> +    <pointer-type-def type-id='type-id-78' size-in-bits='64'
> id='type-id-65'/>
>      <!-- DBusHashTable* -->
> -    <pointer-type-def type-id='type-id-72' size-in-bits='64'
> id='type-id-110'/>
> +    <pointer-type-def type-id='type-id-52' size-in-bits='64'
> id='type-id-36'/>
>      <!-- DBusMessage* -->
> -    <pointer-type-def type-id='type-id-57' size-in-bits='64'
> id='type-id-111'/>
> +    <pointer-type-def type-id='type-id-53' size-in-bits='64'
> id='type-id-30'/>
>      <!-- DBusObjectTree* -->
> -    <pointer-type-def type-id='type-id-78' size-in-bits='64'
> id='type-id-112'/>
> +    <pointer-type-def type-id='type-id-54' size-in-bits='64'
> id='type-id-41'/>
>      <!-- DBusPendingCall* -->
> -    <pointer-type-def type-id='type-id-106' size-in-bits='64'
> id='type-id-113'/>
> +    <pointer-type-def type-id='type-id-122' size-in-bits='64'
> id='type-id-123'/>
>      <!-- DBusPendingCall** -->
> -    <pointer-type-def type-id='type-id-113' size-in-bits='64'
> id='type-id-114'/>
> +    <pointer-type-def type-id='type-id-123' size-in-bits='64'
> id='type-id-124'/>
>      <!-- DBusPreallocatedSend* -->
> -    <pointer-type-def type-id='type-id-105' size-in-bits='64'
> id='type-id-115'/>
> +    <pointer-type-def type-id='type-id-121' size-in-bits='64'
> id='type-id-125'/>
>      <!-- DBusRMutex* -->
> -    <pointer-type-def type-id='type-id-53' size-in-bits='64'
> id='type-id-116'/>
> +    <pointer-type-def type-id='type-id-55' size-in-bits='64'
> id='type-id-27'/>
>      <!-- DBusTimeout* -->
> -    <pointer-type-def type-id='type-id-94' size-in-bits='64'
> id='type-id-117'/>
> +    <pointer-type-def type-id='type-id-110' size-in-bits='64'
> id='type-id-90'/>
>      <!-- DBusTimeoutList* -->
> -    <pointer-type-def type-id='type-id-71' size-in-bits='64'
> id='type-id-118'/>
> +    <pointer-type-def type-id='type-id-56' size-in-bits='64'
> id='type-id-34'/>
>      <!-- DBusTransport* -->
> -    <pointer-type-def type-id='type-id-69' size-in-bits='64'
> id='type-id-119'/>
> +    <pointer-type-def type-id='type-id-57' size-in-bits='64'
> id='type-id-32'/>
>      <!-- DBusWatch* -->
> -    <pointer-type-def type-id='type-id-100' size-in-bits='64'
> id='type-id-120'/>
> +    <pointer-type-def type-id='type-id-116' size-in-bits='64'
> id='type-id-126'/>
>      <!-- DBusWatchList* -->
> -    <pointer-type-def type-id='type-id-70' size-in-bits='64'
> id='type-id-121'/>
> +    <pointer-type-def type-id='type-id-58' size-in-bits='64'
> id='type-id-33'/>
>      <!-- char** -->
> -    <pointer-type-def type-id='type-id-22' size-in-bits='64'
> id='type-id-122'/>
> +    <pointer-type-def type-id='type-id-22' size-in-bits='64'
> id='type-id-127'/>
>      <!-- char*** -->
> -    <pointer-type-def type-id='type-id-122' size-in-bits='64'
> id='type-id-123'/>
> +    <pointer-type-def type-id='type-id-127' size-in-bits='64'
> id='type-id-128'/>
>      <!-- const DBusObjectPathVTable -->
> -    <qualified-type-def type-id='type-id-80' const='yes'
> id='type-id-124'/>
> +    <qualified-type-def type-id='type-id-96' const='yes'
> id='type-id-129'/>
>      <!-- const DBusObjectPathVTable* -->
> -    <pointer-type-def type-id='type-id-124' size-in-bits='64'
> id='type-id-125'/>
> +    <pointer-type-def type-id='type-id-129' size-in-bits='64'
> id='type-id-130'/>
>      <!-- dbus_int32_t* -->
> -    <pointer-type-def type-id='type-id-52' size-in-bits='64'
> id='type-id-126'/>
> +    <pointer-type-def type-id='type-id-81' size-in-bits='64'
> id='type-id-131'/>
>      <!-- typedef DBusHandlerResult (DBusConnection*, DBusMessage*,
> void*)* -->
> -    <pointer-type-def type-id='type-id-127' size-in-bits='64'
> id='type-id-84'/>
> +    <pointer-type-def type-id='type-id-132' size-in-bits='64'
> id='type-id-100'/>
>      <!-- typedef dbus_bool_t (DBusConnection*, const char*, void*)* -->
> -    <pointer-type-def type-id='type-id-128' size-in-bits='64'
> id='type-id-88'/>
> +    <pointer-type-def type-id='type-id-133' size-in-bits='64'
> id='type-id-104'/>
>      <!-- typedef dbus_bool_t (DBusConnection*, unsigned long int, void*)*
> -->
> -    <pointer-type-def type-id='type-id-129' size-in-bits='64'
> id='type-id-90'/>
> +    <pointer-type-def type-id='type-id-134' size-in-bits='64'
> id='type-id-106'/>
>      <!-- typedef dbus_bool_t (DBusTimeout*, void*)* -->
> -    <pointer-type-def type-id='type-id-130' size-in-bits='64'
> id='type-id-92'/>
> +    <pointer-type-def type-id='type-id-135' size-in-bits='64'
> id='type-id-108'/>
>      <!-- typedef dbus_bool_t (DBusWatch*, void*)* -->
> -    <pointer-type-def type-id='type-id-131' size-in-bits='64'
> id='type-id-98'/>
> +    <pointer-type-def type-id='type-id-136' size-in-bits='64'
> id='type-id-114'/>
>      <!-- unsigned long int* -->
> -    <pointer-type-def type-id='type-id-27' size-in-bits='64'
> id='type-id-132'/>
> +    <pointer-type-def type-id='type-id-43' size-in-bits='64'
> id='type-id-137'/>
>      <!-- void (DBusConnection*, typedef DBusDispatchStatus, void*)* -->
> -    <pointer-type-def type-id='type-id-133' size-in-bits='64'
> id='type-id-74'/>
> +    <pointer-type-def type-id='type-id-76' size-in-bits='64'
> id='type-id-62'/>
>      <!-- void (DBusConnection*, void*)* -->
> -    <pointer-type-def type-id='type-id-134' size-in-bits='64'
> id='type-id-83'/>
> +    <pointer-type-def type-id='type-id-138' size-in-bits='64'
> id='type-id-99'/>
>      <!-- void (DBusTimeout*, void*)* -->
> -    <pointer-type-def type-id='type-id-135' size-in-bits='64'
> id='type-id-95'/>
> +    <pointer-type-def type-id='type-id-139' size-in-bits='64'
> id='type-id-111'/>
>      <!-- void (DBusWatch*, void*)* -->
> -    <pointer-type-def type-id='type-id-136' size-in-bits='64'
> id='type-id-101'/>
> +    <pointer-type-def type-id='type-id-140' size-in-bits='64'
> id='type-id-117'/>
>      <!-- void (void*)* -->
> -    <pointer-type-def type-id='type-id-137' size-in-bits='64'
> id='type-id-67'/>
> +    <pointer-type-def type-id='type-id-77' size-in-bits='64'
> id='type-id-63'/>
>      <!-- void** -->
> -    <pointer-type-def type-id='type-id-10' size-in-bits='64'
> id='type-id-138'/>
> +    <pointer-type-def type-id='type-id-10' size-in-bits='64'
> id='type-id-141'/>
>      <!-- volatile dbus_int32_t -->
> -    <qualified-type-def type-id='type-id-52' volatile='yes'
> id='type-id-51'/>
> +    <qualified-type-def type-id='type-id-81' volatile='yes'
> id='type-id-64'/>
>      <!-- void dbus_connection_set_change_sigpipe(dbus_bool_t) -->
>      <function-decl name='dbus_connection_set_change_sigpipe'
> mangled-name='dbus_connection_set_change_sigpipe'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6043' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_change_sigpipe'>
>        <!-- parameter of type 'typedef dbus_bool_t' -->
> @@ -1176,54 +1666,54 @@
>      <!-- void* dbus_connection_get_data(DBusConnection*, dbus_int32_t) -->
>      <function-decl name='dbus_connection_get_data'
> mangled-name='dbus_connection_get_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6017' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_data'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6017' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6017' column='1'/>
>        <!-- parameter of type 'typedef dbus_int32_t' -->
> -      <parameter type-id='type-id-52' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6018' column='1'/>
> +      <parameter type-id='type-id-81' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6018' column='1'/>
>        <!-- void* -->
>        <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_set_data(DBusConnection*,
> dbus_int32_t, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_connection_set_data'
> mangled-name='dbus_connection_set_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5968' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_data'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5968' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5968' column='1'/>
>        <!-- parameter of type 'typedef dbus_int32_t' -->
> -      <parameter type-id='type-id-52' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5969' column='1'/>
> +      <parameter type-id='type-id-81' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5969' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5970' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_func'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5971' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_func'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5971' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_connection_free_data_slot(dbus_int32_t*) -->
>      <function-decl name='dbus_connection_free_data_slot'
> mangled-name='dbus_connection_free_data_slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5938' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_free_data_slot'>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5938' column='1'/>
> +      <parameter type-id='type-id-131' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5938' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_allocate_data_slot(dbus_int32_t*) -->
>      <function-decl name='dbus_connection_allocate_data_slot'
> mangled-name='dbus_connection_allocate_data_slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5920' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_allocate_data_slot'>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5920' column='1'/>
> +      <parameter type-id='type-id-131' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5920' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_list_registered(DBusConnection*,
> const char*, char***) -->
>      <function-decl name='dbus_connection_list_registered'
> mangled-name='dbus_connection_list_registered'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5878' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_list_registered'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5878' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5878' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='parent_path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5879' column='1'/>
>        <!-- parameter of type 'char***' -->
> -      <parameter type-id='type-id-123' name='child_entries'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5880' column='1'/>
> +      <parameter type-id='type-id-128' name='child_entries'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5880' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t
> dbus_connection_unregister_object_path(DBusConnection*, const char*) -->
>      <function-decl name='dbus_connection_unregister_object_path'
> mangled-name='dbus_connection_unregister_object_path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5809' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_unregister_object_path'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5809' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5809' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5810' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1232,107 +1722,107 @@
>      <!-- DBusConnection* dbus_connection_ref(DBusConnection*) -->
>      <function-decl name='dbus_connection_ref'
> mangled-name='dbus_connection_ref'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2681' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_ref'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2681' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2681' column='1'/>
>        <!-- DBusConnection* -->
> -      <return type-id='type-id-31'/>
> +      <return type-id='type-id-47'/>
>      </function-decl>
>      <!-- long int dbus_connection_get_outgoing_unix_fds(DBusConnection*)
> -->
>      <function-decl name='dbus_connection_get_outgoing_unix_fds'
> mangled-name='dbus_connection_get_outgoing_unix_fds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6296' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_outgoing_unix_fds'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6296' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6296' column='1'/>
>        <!-- long int -->
> -      <return type-id='type-id-48'/>
> +      <return type-id='type-id-80'/>
>      </function-decl>
>      <!-- long int dbus_connection_get_outgoing_size(DBusConnection*) -->
>      <function-decl name='dbus_connection_get_outgoing_size'
> mangled-name='dbus_connection_get_outgoing_size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6235' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_outgoing_size'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6235' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6235' column='1'/>
>        <!-- long int -->
> -      <return type-id='type-id-48'/>
> +      <return type-id='type-id-80'/>
>      </function-decl>
>      <!-- long int
> dbus_connection_get_max_received_unix_fds(DBusConnection*) -->
>      <function-decl name='dbus_connection_get_max_received_unix_fds'
> mangled-name='dbus_connection_get_max_received_unix_fds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6212' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_max_received_unix_fds'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6212' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6212' column='1'/>
>        <!-- long int -->
> -      <return type-id='type-id-48'/>
> +      <return type-id='type-id-80'/>
>      </function-decl>
>      <!-- void dbus_connection_set_max_received_unix_fds(DBusConnection*,
> long int) -->
>      <function-decl name='dbus_connection_set_max_received_unix_fds'
> mangled-name='dbus_connection_set_max_received_unix_fds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6194' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_max_received_unix_fds'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6194' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6194' column='1'/>
>        <!-- parameter of type 'long int' -->
> -      <parameter type-id='type-id-48' name='n'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6195' column='1'/>
> +      <parameter type-id='type-id-80' name='n'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6195' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- long int dbus_connection_get_max_received_size(DBusConnection*)
> -->
>      <function-decl name='dbus_connection_get_max_received_size'
> mangled-name='dbus_connection_get_max_received_size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6170' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_max_received_size'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6170' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6170' column='1'/>
>        <!-- long int -->
> -      <return type-id='type-id-48'/>
> +      <return type-id='type-id-80'/>
>      </function-decl>
>      <!-- void dbus_connection_set_max_received_size(DBusConnection*, long
> int) -->
>      <function-decl name='dbus_connection_set_max_received_size'
> mangled-name='dbus_connection_set_max_received_size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6152' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_max_received_size'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6152' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6152' column='1'/>
>        <!-- parameter of type 'long int' -->
> -      <parameter type-id='type-id-48' name='size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6153' column='1'/>
> +      <parameter type-id='type-id-80' name='size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6153' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- long int
> dbus_connection_get_max_message_unix_fds(DBusConnection*) -->
>      <function-decl name='dbus_connection_get_max_message_unix_fds'
> mangled-name='dbus_connection_get_max_message_unix_fds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6114' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_max_message_unix_fds'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6114' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6114' column='1'/>
>        <!-- long int -->
> -      <return type-id='type-id-48'/>
> +      <return type-id='type-id-80'/>
>      </function-decl>
>      <!-- void dbus_connection_set_max_message_unix_fds(DBusConnection*,
> long int) -->
>      <function-decl name='dbus_connection_set_max_message_unix_fds'
> mangled-name='dbus_connection_set_max_message_unix_fds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6096' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_max_message_unix_fds'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6096' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6096' column='1'/>
>        <!-- parameter of type 'long int' -->
> -      <parameter type-id='type-id-48' name='n'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6097' column='1'/>
> +      <parameter type-id='type-id-80' name='n'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6097' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- long int dbus_connection_get_max_message_size(DBusConnection*)
> -->
>      <function-decl name='dbus_connection_get_max_message_size'
> mangled-name='dbus_connection_get_max_message_size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6075' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_max_message_size'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6075' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6075' column='1'/>
>        <!-- long int -->
> -      <return type-id='type-id-48'/>
> +      <return type-id='type-id-80'/>
>      </function-decl>
>      <!-- void dbus_connection_set_max_message_size(DBusConnection*, long
> int) -->
>      <function-decl name='dbus_connection_set_max_message_size'
> mangled-name='dbus_connection_set_max_message_size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6057' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_max_message_size'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6057' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6057' column='1'/>
>        <!-- parameter of type 'long int' -->
> -      <parameter type-id='type-id-48' name='size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6058' column='1'/>
> +      <parameter type-id='type-id-80' name='size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='6058' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t
> dbus_connection_get_object_path_data(DBusConnection*, const char*, void**)
> -->
>      <function-decl name='dbus_connection_get_object_path_data'
> mangled-name='dbus_connection_get_object_path_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5841' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_object_path_data'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5841' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5841' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5842' column='1'/>
>        <!-- parameter of type 'void**' -->
> -      <parameter type-id='type-id-138' name='data_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5843' column='1'/>
> +      <parameter type-id='type-id-141' name='data_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5843' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_register_fallback(DBusConnection*,
> const char*, const DBusObjectPathVTable*, void*) -->
>      <function-decl name='dbus_connection_register_fallback'
> mangled-name='dbus_connection_register_fallback'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5774' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_register_fallback'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5774' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5774' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5775' column='1'/>
>        <!-- parameter of type 'const DBusObjectPathVTable*' -->
> -      <parameter type-id='type-id-125' name='vtable'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5776' column='1'/>
> +      <parameter type-id='type-id-130' name='vtable'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5776' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5777' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1341,11 +1831,11 @@
>      <!-- dbus_bool_t
> dbus_connection_try_register_fallback(DBusConnection*, const char*, const
> DBusObjectPathVTable*, void*, DBusError*) -->
>      <function-decl name='dbus_connection_try_register_fallback'
> mangled-name='dbus_connection_try_register_fallback'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5742' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_try_register_fallback'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5742' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5742' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5743' column='1'/>
>        <!-- parameter of type 'const DBusObjectPathVTable*' -->
> -      <parameter type-id='type-id-125' name='vtable'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5744' column='1'/>
> +      <parameter type-id='type-id-130' name='vtable'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5744' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5745' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
> @@ -1356,11 +1846,11 @@
>      <!-- dbus_bool_t
> dbus_connection_register_object_path(DBusConnection*, const char*, const
> DBusObjectPathVTable*, void*) -->
>      <function-decl name='dbus_connection_register_object_path'
> mangled-name='dbus_connection_register_object_path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5702' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_register_object_path'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5702' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5702' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5703' column='1'/>
>        <!-- parameter of type 'const DBusObjectPathVTable*' -->
> -      <parameter type-id='type-id-125' name='vtable'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5704' column='1'/>
> +      <parameter type-id='type-id-130' name='vtable'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5704' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5705' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1369,11 +1859,11 @@
>      <!-- dbus_bool_t
> dbus_connection_try_register_object_path(DBusConnection*, const char*,
> const DBusObjectPathVTable*, void*, DBusError*) -->
>      <function-decl name='dbus_connection_try_register_object_path'
> mangled-name='dbus_connection_try_register_object_path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5672' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_try_register_object_path'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5672' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5672' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5673' column='1'/>
>        <!-- parameter of type 'const DBusObjectPathVTable*' -->
> -      <parameter type-id='type-id-125' name='vtable'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5674' column='1'/>
> +      <parameter type-id='type-id-130' name='vtable'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5674' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5675' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
> @@ -1384,9 +1874,9 @@
>      <!-- void dbus_connection_remove_filter(DBusConnection*,
> DBusHandleMessageFunction, void*) -->
>      <function-decl name='dbus_connection_remove_filter'
> mangled-name='dbus_connection_remove_filter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5563' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_remove_filter'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5563' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5563' column='1'/>
>        <!-- parameter of type 'typedef DBusHandleMessageFunction' -->
> -      <parameter type-id='type-id-87' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5564' column='1'/>
> +      <parameter type-id='type-id-103' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5564' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5565' column='1'/>
>        <!-- void -->
> @@ -1395,20 +1885,20 @@
>      <!-- dbus_bool_t dbus_connection_add_filter(DBusConnection*,
> DBusHandleMessageFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_connection_add_filter'
> mangled-name='dbus_connection_add_filter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5511' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_add_filter'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5511' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5511' column='1'/>
>        <!-- parameter of type 'typedef DBusHandleMessageFunction' -->
> -      <parameter type-id='type-id-87' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5512' column='1'/>
> +      <parameter type-id='type-id-103' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5512' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5513' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5514' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5514' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_connection_set_route_peer_messages(DBusConnection*,
> dbus_bool_t) -->
>      <function-decl name='dbus_connection_set_route_peer_messages'
> mangled-name='dbus_connection_set_route_peer_messages'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5479' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_route_peer_messages'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5479' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5479' column='1'/>
>        <!-- parameter of type 'typedef dbus_bool_t' -->
>        <parameter type-id='type-id-17' name='value'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5480' column='1'/>
>        <!-- void -->
> @@ -1417,7 +1907,7 @@
>      <!-- void dbus_connection_set_allow_anonymous(DBusConnection*,
> dbus_bool_t) -->
>      <function-decl name='dbus_connection_set_allow_anonymous'
> mangled-name='dbus_connection_set_allow_anonymous'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5451' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_allow_anonymous'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5451' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5451' column='1'/>
>        <!-- parameter of type 'typedef dbus_bool_t' -->
>        <parameter type-id='type-id-17' name='value'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5452' column='1'/>
>        <!-- void -->
> @@ -1426,71 +1916,71 @@
>      <!-- void dbus_connection_set_windows_user_function(DBusConnection*,
> DBusAllowWindowsUserFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_connection_set_windows_user_function'
> mangled-name='dbus_connection_set_windows_user_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5404' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_windows_user_function'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5404' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5404' column='1'/>
>        <!-- parameter of type 'typedef DBusAllowWindowsUserFunction' -->
> -      <parameter type-id='type-id-89' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5405' column='1'/>
> +      <parameter type-id='type-id-105' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5405' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5406' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5407' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5407' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_get_windows_user(DBusConnection*,
> char**) -->
>      <function-decl name='dbus_connection_get_windows_user'
> mangled-name='dbus_connection_get_windows_user'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5357' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_windows_user'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5357' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5357' column='1'/>
>        <!-- parameter of type 'char**' -->
> -      <parameter type-id='type-id-122' name='windows_sid_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5358' column='1'/>
> +      <parameter type-id='type-id-127' name='windows_sid_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5358' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_connection_set_unix_user_function(DBusConnection*,
> DBusAllowUnixUserFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_connection_set_unix_user_function'
> mangled-name='dbus_connection_set_unix_user_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5305' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_unix_user_function'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5305' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5305' column='1'/>
>        <!-- parameter of type 'typedef DBusAllowUnixUserFunction' -->
> -      <parameter type-id='type-id-91' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5306' column='1'/>
> +      <parameter type-id='type-id-107' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5306' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5307' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5308' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5308' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t
> dbus_connection_get_adt_audit_session_data(DBusConnection*, void**,
> dbus_int32_t*) -->
>      <function-decl name='dbus_connection_get_adt_audit_session_data'
> mangled-name='dbus_connection_get_adt_audit_session_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5259' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='dbus_connection_get_adt_audit_session_data'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5259' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5259' column='1'/>
>        <!-- parameter of type 'void**' -->
> -      <parameter type-id='type-id-138' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5260' column='1'/>
> +      <parameter type-id='type-id-141' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5260' column='1'/>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='data_size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5261' column='1'/>
> +      <parameter type-id='type-id-131' name='data_size'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5261' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_get_unix_process_id(DBusConnection*,
> unsigned long int*) -->
>      <function-decl name='dbus_connection_get_unix_process_id'
> mangled-name='dbus_connection_get_unix_process_id'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5226' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_unix_process_id'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5226' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5226' column='1'/>
>        <!-- parameter of type 'unsigned long int*' -->
> -      <parameter type-id='type-id-132' name='pid'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5227' column='1'/>
> +      <parameter type-id='type-id-137' name='pid'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5227' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_get_unix_user(DBusConnection*,
> unsigned long int*) -->
>      <function-decl name='dbus_connection_get_unix_user'
> mangled-name='dbus_connection_get_unix_user'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5190' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_unix_user'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5190' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5190' column='1'/>
>        <!-- parameter of type 'unsigned long int*' -->
> -      <parameter type-id='type-id-132' name='uid'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5191' column='1'/>
> +      <parameter type-id='type-id-137' name='uid'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5191' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_get_socket(DBusConnection*, int*) -->
>      <function-decl name='dbus_connection_get_socket'
> mangled-name='dbus_connection_get_socket'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5148' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_socket'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5148' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5148' column='1'/>
>        <!-- parameter of type 'int*' -->
>        <parameter type-id='type-id-24' name='fd'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5149' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1499,7 +1989,7 @@
>      <!-- dbus_bool_t dbus_connection_get_unix_fd(DBusConnection*, int*)
> -->
>      <function-decl name='dbus_connection_get_unix_fd'
> mangled-name='dbus_connection_get_unix_fd'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5118' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_unix_fd'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5118' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5118' column='1'/>
>        <!-- parameter of type 'int*' -->
>        <parameter type-id='type-id-24' name='fd'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5119' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1508,67 +1998,67 @@
>      <!-- void
> dbus_connection_set_dispatch_status_function(DBusConnection*,
> DBusDispatchStatusFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_connection_set_dispatch_status_function'
> mangled-name='dbus_connection_set_dispatch_status_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5073' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='dbus_connection_set_dispatch_status_function'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5073' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5073' column='1'/>
>        <!-- parameter of type 'typedef DBusDispatchStatusFunction' -->
> -      <parameter type-id='type-id-75' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5074' column='1'/>
> +      <parameter type-id='type-id-39' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5074' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5075' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5076' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5076' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- void dbus_connection_set_wakeup_main_function(DBusConnection*,
> DBusWakeupMainFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_connection_set_wakeup_main_function'
> mangled-name='dbus_connection_set_wakeup_main_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5027' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_wakeup_main_function'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5027' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5027' column='1'/>
>        <!-- parameter of type 'typedef DBusWakeupMainFunction' -->
> -      <parameter type-id='type-id-73' name='wakeup_main_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5028' column='1'/>
> +      <parameter type-id='type-id-37' name='wakeup_main_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5028' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5029' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5030' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='5030' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t
> dbus_connection_set_timeout_functions(DBusConnection*,
> DBusAddTimeoutFunction, DBusRemoveTimeoutFunction,
> DBusTimeoutToggledFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_connection_set_timeout_functions'
> mangled-name='dbus_connection_set_timeout_functions'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4989' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_timeout_functions'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4989' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4989' column='1'/>
>        <!-- parameter of type 'typedef DBusAddTimeoutFunction' -->
> -      <parameter type-id='type-id-93' name='add_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4990' column='1'/>
> +      <parameter type-id='type-id-109' name='add_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4990' column='1'/>
>        <!-- parameter of type 'typedef DBusRemoveTimeoutFunction' -->
> -      <parameter type-id='type-id-96' name='remove_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4991' column='1'/>
> +      <parameter type-id='type-id-112' name='remove_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4991' column='1'/>
>        <!-- parameter of type 'typedef DBusTimeoutToggledFunction' -->
> -      <parameter type-id='type-id-97' name='toggled_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4992' column='1'/>
> +      <parameter type-id='type-id-113' name='toggled_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4992' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4993' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4994' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4994' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_set_watch_functions(DBusConnection*,
> DBusAddWatchFunction, DBusRemoveWatchFunction, DBusWatchToggledFunction,
> void*, DBusFreeFunction) -->
>      <function-decl name='dbus_connection_set_watch_functions'
> mangled-name='dbus_connection_set_watch_functions'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4926' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_watch_functions'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4926' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4926' column='1'/>
>        <!-- parameter of type 'typedef DBusAddWatchFunction' -->
> -      <parameter type-id='type-id-99' name='add_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4927' column='1'/>
> +      <parameter type-id='type-id-115' name='add_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4927' column='1'/>
>        <!-- parameter of type 'typedef DBusRemoveWatchFunction' -->
> -      <parameter type-id='type-id-102' name='remove_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4928' column='1'/>
> +      <parameter type-id='type-id-118' name='remove_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4928' column='1'/>
>        <!-- parameter of type 'typedef DBusWatchToggledFunction' -->
> -      <parameter type-id='type-id-103' name='toggled_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4929' column='1'/>
> +      <parameter type-id='type-id-119' name='toggled_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4929' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4930' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4931' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4931' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_connection_set_exit_on_disconnect(DBusConnection*,
> dbus_bool_t) -->
>      <function-decl name='dbus_connection_set_exit_on_disconnect'
> mangled-name='dbus_connection_set_exit_on_disconnect'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3145' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_set_exit_on_disconnect'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3145' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3145' column='1'/>
>        <!-- parameter of type 'typedef dbus_bool_t' -->
>        <parameter type-id='type-id-17' name='exit_on_disconnect'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3146' column='1'/>
>        <!-- void -->
> @@ -1577,44 +2067,44 @@
>      <!-- dbus_bool_t
> dbus_connection_get_is_authenticated(DBusConnection*) -->
>      <function-decl name='dbus_connection_get_is_authenticated'
> mangled-name='dbus_connection_get_is_authenticated'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2995' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_is_authenticated'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2995' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2995' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t
> dbus_connection_has_messages_to_send(DBusConnection*) -->
>      <function-decl name='dbus_connection_has_messages_to_send'
> mangled-name='dbus_connection_has_messages_to_send'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='588' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_has_messages_to_send'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='588' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='588' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- DBusPreallocatedSend*
> dbus_connection_preallocate_send(DBusConnection*) -->
>      <function-decl name='dbus_connection_preallocate_send'
> mangled-name='dbus_connection_preallocate_send'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3165' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_preallocate_send'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3165' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3165' column='1'/>
>        <!-- DBusPreallocatedSend* -->
> -      <return type-id='type-id-115'/>
> +      <return type-id='type-id-125'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_get_is_connected(DBusConnection*) -->
>      <function-decl name='dbus_connection_get_is_connected'
> mangled-name='dbus_connection_get_is_connected'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2973' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_is_connected'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2973' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2973' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_connection_free_preallocated_send(DBusConnection*,
> DBusPreallocatedSend*) -->
>      <function-decl name='dbus_connection_free_preallocated_send'
> mangled-name='dbus_connection_free_preallocated_send'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3191' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_free_preallocated_send'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3191' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3191' column='1'/>
>        <!-- parameter of type 'DBusPreallocatedSend*' -->
> -      <parameter type-id='type-id-115' name='preallocated'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3192' column='1'/>
> +      <parameter type-id='type-id-125' name='preallocated'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3192' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_can_send_type(DBusConnection*, int)
> -->
>      <function-decl name='dbus_connection_can_send_type'
> mangled-name='dbus_connection_can_send_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3105' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_can_send_type'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3105' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3105' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3106' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1623,98 +2113,98 @@
>      <!-- char* dbus_connection_get_server_id(DBusConnection*) -->
>      <function-decl name='dbus_connection_get_server_id'
> mangled-name='dbus_connection_get_server_id'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3074' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_server_id'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3074' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3074' column='1'/>
>        <!-- char* -->
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_get_is_anonymous(DBusConnection*) -->
>      <function-decl name='dbus_connection_get_is_anonymous'
> mangled-name='dbus_connection_get_is_anonymous'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3029' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_is_anonymous'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3029' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3029' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_connection_unref(DBusConnection*) -->
>      <function-decl name='dbus_connection_unref'
> mangled-name='dbus_connection_unref'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2817' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_unref'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2817' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2817' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- DBusDispatchStatus
> dbus_connection_get_dispatch_status(DBusConnection*) -->
>      <function-decl name='dbus_connection_get_dispatch_status'
> mangled-name='dbus_connection_get_dispatch_status'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4378' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_get_dispatch_status'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4378' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4378' column='1'/>
>        <!-- typedef DBusDispatchStatus -->
> -      <return type-id='type-id-77'/>
> +      <return type-id='type-id-40'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_connection_borrow_message(DBusConnection*) -->
>      <function-decl name='dbus_connection_borrow_message'
> mangled-name='dbus_connection_borrow_message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3850' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_borrow_message'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3850' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3850' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_connection_pop_message(DBusConnection*) -->
>      <function-decl name='dbus_connection_pop_message'
> mangled-name='dbus_connection_pop_message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4091' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_pop_message'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4091' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4091' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- void dbus_connection_steal_borrowed_message(DBusConnection*,
> DBusMessage*) -->
>      <function-decl name='dbus_connection_steal_borrowed_message'
> mangled-name='dbus_connection_steal_borrowed_message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3935' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_steal_borrowed_message'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3935' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3935' column='1'/>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3936' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3936' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- void dbus_connection_return_message(DBusConnection*,
> DBusMessage*) -->
>      <function-decl name='dbus_connection_return_message'
> mangled-name='dbus_connection_return_message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3901' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_return_message'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3901' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3901' column='1'/>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3902' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3902' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- void dbus_connection_flush(DBusConnection*) -->
>      <function-decl name='dbus_connection_flush'
> mangled-name='dbus_connection_flush'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3641' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_flush'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3641' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3641' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- void dbus_connection_send_preallocated(DBusConnection*,
> DBusPreallocatedSend*, DBusMessage*, dbus_uint32_t*) -->
>      <function-decl name='dbus_connection_send_preallocated'
> mangled-name='dbus_connection_send_preallocated'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3217' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_send_preallocated'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3217' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3217' column='1'/>
>        <!-- parameter of type 'DBusPreallocatedSend*' -->
> -      <parameter type-id='type-id-115' name='preallocated'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3218' column='1'/>
> +      <parameter type-id='type-id-125' name='preallocated'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3218' column='1'/>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3219' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3219' column='1'/>
>        <!-- parameter of type 'dbus_uint32_t*' -->
> -      <parameter type-id='type-id-32' name='client_serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3220' column='1'/>
> +      <parameter type-id='type-id-48' name='client_serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3220' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_send(DBusConnection*, DBusMessage*,
> dbus_uint32_t*) -->
>      <function-decl name='dbus_connection_send'
> mangled-name='dbus_connection_send'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3302' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_send'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3302' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3302' column='1'/>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3303' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3303' column='1'/>
>        <!-- parameter of type 'dbus_uint32_t*' -->
> -      <parameter type-id='type-id-32' name='serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3304' column='1'/>
> +      <parameter type-id='type-id-48' name='serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3304' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_connection_close(DBusConnection*) -->
>      <function-decl name='dbus_connection_close'
> mangled-name='dbus_connection_close'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2932' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_close'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2932' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2932' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
> @@ -1725,7 +2215,7 @@
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2660' column='1'/>
>        <!-- DBusConnection* -->
> -      <return type-id='type-id-31'/>
> +      <return type-id='type-id-47'/>
>      </function-decl>
>      <!-- DBusConnection* dbus_connection_open(const char*, DBusError*) -->
>      <function-decl name='dbus_connection_open'
> mangled-name='dbus_connection_open'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2616' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_open'>
> @@ -1734,16 +2224,16 @@
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='2617' column='1'/>
>        <!-- DBusConnection* -->
> -      <return type-id='type-id-31'/>
> +      <return type-id='type-id-47'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_send_with_reply(DBusConnection*,
> DBusMessage*, DBusPendingCall**, int) -->
>      <function-decl name='dbus_connection_send_with_reply'
> mangled-name='dbus_connection_send_with_reply'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3399' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_send_with_reply'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3399' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3399' column='1'/>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3400' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3400' column='1'/>
>        <!-- parameter of type 'DBusPendingCall**' -->
> -      <parameter type-id='type-id-114' name='pending_return'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3401' column='1'/>
> +      <parameter type-id='type-id-124' name='pending_return'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3401' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='timeout_milliseconds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3402' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1752,27 +2242,27 @@
>      <!-- DBusMessage*
> dbus_connection_send_with_reply_and_block(DBusConnection*, DBusMessage*,
> int, DBusError*) -->
>      <function-decl name='dbus_connection_send_with_reply_and_block'
> mangled-name='dbus_connection_send_with_reply_and_block'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3535' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_send_with_reply_and_block'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3535' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3535' column='1'/>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3536' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3536' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='timeout_milliseconds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3537' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3538' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- DBusDispatchStatus dbus_connection_dispatch(DBusConnection*) -->
>      <function-decl name='dbus_connection_dispatch'
> mangled-name='dbus_connection_dispatch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4549' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_dispatch'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4549' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='4549' column='1'/>
>        <!-- typedef DBusDispatchStatus -->
> -      <return type-id='type-id-77'/>
> +      <return type-id='type-id-40'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_connection_read_write(DBusConnection*, int) -->
>      <function-decl name='dbus_connection_read_write'
> mangled-name='dbus_connection_read_write'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3801' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_read_write'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3801' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3801' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='timeout_milliseconds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3802' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1781,27 +2271,27 @@
>      <!-- dbus_bool_t dbus_connection_read_write_dispatch(DBusConnection*,
> int) -->
>      <function-decl name='dbus_connection_read_write_dispatch'
> mangled-name='dbus_connection_read_write_dispatch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3769' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_connection_read_write_dispatch'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3769' column='1'/>
> +      <parameter type-id='type-id-47' name='connection'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3769' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='timeout_milliseconds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c'
> line='3770' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- DBusHandlerResult (DBusConnection*, DBusMessage*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-127'>
> +    <function-type size-in-bits='64' id='type-id-132'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31'/>
> +      <parameter type-id='type-id-47'/>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111'/>
> +      <parameter type-id='type-id-30'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- typedef DBusHandlerResult -->
> -      <return type-id='type-id-86'/>
> +      <return type-id='type-id-102'/>
>      </function-type>
>      <!-- dbus_bool_t (DBusConnection*, const char*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-128'>
> +    <function-type size-in-bits='64' id='type-id-133'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31'/>
> +      <parameter type-id='type-id-47'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15'/>
>        <!-- parameter of type 'void*' -->
> @@ -1810,91 +2300,103 @@
>        <return type-id='type-id-17'/>
>      </function-type>
>      <!-- dbus_bool_t (DBusConnection*, unsigned long int, void*) -->
> -    <function-type size-in-bits='64' id='type-id-129'>
> +    <function-type size-in-bits='64' id='type-id-134'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31'/>
> +      <parameter type-id='type-id-47'/>
>        <!-- parameter of type 'unsigned long int' -->
> -      <parameter type-id='type-id-27'/>
> +      <parameter type-id='type-id-43'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-type>
>      <!-- dbus_bool_t (DBusTimeout*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-130'>
> +    <function-type size-in-bits='64' id='type-id-135'>
>        <!-- parameter of type 'DBusTimeout*' -->
> -      <parameter type-id='type-id-117'/>
> +      <parameter type-id='type-id-90'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-type>
>      <!-- dbus_bool_t (DBusWatch*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-131'>
> +    <function-type size-in-bits='64' id='type-id-136'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120'/>
> +      <parameter type-id='type-id-126'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-type>
>      <!-- void (DBusConnection*, DBusDispatchStatus, void*) -->
> -    <function-type size-in-bits='64' id='type-id-133'>
> +    <function-type size-in-bits='64' id='type-id-76'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31'/>
> +      <parameter type-id='type-id-47'/>
>        <!-- parameter of type 'typedef DBusDispatchStatus' -->
> -      <parameter type-id='type-id-77'/>
> +      <parameter type-id='type-id-40'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- void (DBusConnection*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-134'>
> +    <function-type size-in-bits='64' id='type-id-138'>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31'/>
> +      <parameter type-id='type-id-47'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- void (DBusTimeout*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-135'>
> +    <function-type size-in-bits='64' id='type-id-139'>
>        <!-- parameter of type 'DBusTimeout*' -->
> -      <parameter type-id='type-id-117'/>
> +      <parameter type-id='type-id-90'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- void (DBusWatch*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-136'>
> +    <function-type size-in-bits='64' id='type-id-140'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120'/>
> +      <parameter type-id='type-id-126'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- void (void*) -->
> -    <function-type size-in-bits='64' id='type-id-137'>
> +    <function-type size-in-bits='64' id='type-id-77'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
> +    <!-- typedef void (DBusPendingCall*, void*)*
> DBusPendingCallNotifyFunction -->
> +    <typedef-decl name='DBusPendingCallNotifyFunction'
> type-id='type-id-142' filepath='../dbus/dbus-connection.h' line='162'
> column='1' id='type-id-89'/>
> +    <!-- typedef typedef dbus_bool_t (void*)* DBusTimeoutHandler -->
> +    <typedef-decl name='DBusTimeoutHandler' type-id='type-id-143'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h'
> line='41' column='1' id='type-id-92'/>
> +    <!-- typedef typedef dbus_bool_t (DBusWatch*, unsigned int, void*)*
> DBusWatchHandler -->
> +    <typedef-decl name='DBusWatchHandler' type-id='type-id-144'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h'
> line='43' column='1' id='type-id-94'/>
> +    <!-- typedef dbus_bool_t (DBusWatch*, unsigned int, void*)* -->
> +    <pointer-type-def type-id='type-id-145' size-in-bits='64'
> id='type-id-144'/>
> +    <!-- typedef dbus_bool_t (void*)* -->
> +    <pointer-type-def type-id='type-id-146' size-in-bits='64'
> id='type-id-143'/>
> +    <!-- void (DBusPendingCall*, void*)* -->
> +    <pointer-type-def type-id='type-id-147' size-in-bits='64'
> id='type-id-142'/>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-errors.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- variadic parameter type -->
> -    <type-decl name='variadic parameter type' id='type-id-139'/>
> +    <type-decl name='variadic parameter type' id='type-id-148'/>
>      <!-- const DBusError -->
> -    <qualified-type-def type-id='type-id-14' const='yes'
> id='type-id-140'/>
> +    <qualified-type-def type-id='type-id-14' const='yes'
> id='type-id-149'/>
>      <!-- const DBusError* -->
> -    <pointer-type-def type-id='type-id-140' size-in-bits='64'
> id='type-id-141'/>
> +    <pointer-type-def type-id='type-id-149' size-in-bits='64'
> id='type-id-150'/>
>      <!-- dbus_bool_t dbus_error_is_set(const DBusError*) -->
>      <function-decl name='dbus_error_is_set'
> mangled-name='dbus_error_is_set'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c'
> line='329' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_error_is_set'>
>        <!-- parameter of type 'const DBusError*' -->
> -      <parameter type-id='type-id-141' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c'
> line='329' column='1'/>
> +      <parameter type-id='type-id-150' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c'
> line='329' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
> @@ -1947,7 +2449,7 @@
>      <!-- dbus_bool_t dbus_error_has_name(const DBusError*, const char*)
> -->
>      <function-decl name='dbus_error_has_name'
> mangled-name='dbus_error_has_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c'
> line='302' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_error_has_name'>
>        <!-- parameter of type 'const DBusError*' -->
> -      <parameter type-id='type-id-141' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c'
> line='302' column='1'/>
> +      <parameter type-id='type-id-150' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c'
> line='302' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c'
> line='303' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -1956,7 +2458,7 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-memory.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- typedef unsigned long int size_t -->
> -    <typedef-decl name='size_t' type-id='type-id-27'
> filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h'
> line='211' column='1' id='type-id-142'/>
> +    <typedef-decl name='size_t' type-id='type-id-43'
> filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h'
> line='211' column='1' id='type-id-151'/>
>      <!-- void dbus_free(void*) -->
>      <function-decl name='dbus_free' mangled-name='dbus_free'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='701' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_free'>
>        <!-- parameter of type 'void*' -->
> @@ -1972,7 +2474,7 @@
>      <!-- void dbus_free_string_array(char**) -->
>      <function-decl name='dbus_free_string_array'
> mangled-name='dbus_free_string_array'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='749' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_free_string_array'>
>        <!-- parameter of type 'char**' -->
> -      <parameter type-id='type-id-122' name='str_array'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='749' column='1'/>
> +      <parameter type-id='type-id-127' name='str_array'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='749' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
> @@ -1981,28 +2483,28 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='memory'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='601' column='1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-142' name='bytes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='602' column='1'/>
> +      <parameter type-id='type-id-151' name='bytes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='602' column='1'/>
>        <!-- void* -->
>        <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void* dbus_malloc0(size_t) -->
>      <function-decl name='dbus_malloc0' mangled-name='dbus_malloc0'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='531' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_malloc0'>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-142' name='bytes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='531' column='1'/>
> +      <parameter type-id='type-id-151' name='bytes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='531' column='1'/>
>        <!-- void* -->
>        <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void* dbus_malloc(size_t) -->
>      <function-decl name='dbus_malloc' mangled-name='dbus_malloc'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='461' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_malloc'>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-142' name='bytes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='461' column='1'/>
> +      <parameter type-id='type-id-151' name='bytes'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c'
> line='461' column='1'/>
>        <!-- void* -->
>        <return type-id='type-id-10'/>
>      </function-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-message.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- struct __va_list_tag -->
> -    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes'
> visibility='default' id='type-id-143'>
> +    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes'
> visibility='default' id='type-id-152'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- unsigned int __va_list_tag::gp_offset -->
>          <var-decl name='gp_offset' type-id='type-id-3'
> visibility='default'/>
> @@ -2021,9 +2523,9 @@
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusMessageIter DBusMessageIter -->
> -    <typedef-decl name='DBusMessageIter' type-id='type-id-144'
> filepath='../dbus/dbus-message.h' line='46' column='1' id='type-id-145'/>
> +    <typedef-decl name='DBusMessageIter' type-id='type-id-153'
> filepath='../dbus/dbus-message.h' line='46' column='1' id='type-id-154'/>
>      <!-- struct DBusMessageIter -->
> -    <class-decl name='DBusMessageIter' size-in-bits='576' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-message.h' line='52' column='1'
> id='type-id-144'>
> +    <class-decl name='DBusMessageIter' size-in-bits='576' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-message.h' line='52' column='1'
> id='type-id-153'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- void* DBusMessageIter::dummy1 -->
>          <var-decl name='dummy1' type-id='type-id-10' visibility='default'
> filepath='../dbus/dbus-message.h' line='53' column='1'/>
> @@ -2082,17 +2584,17 @@
>        </data-member>
>      </class-decl>
>      <!-- DBusMessageIter* -->
> -    <pointer-type-def type-id='type-id-145' size-in-bits='64'
> id='type-id-146'/>
> +    <pointer-type-def type-id='type-id-154' size-in-bits='64'
> id='type-id-155'/>
>      <!-- __va_list_tag* -->
> -    <pointer-type-def type-id='type-id-143' size-in-bits='64'
> id='type-id-147'/>
> +    <pointer-type-def type-id='type-id-152' size-in-bits='64'
> id='type-id-156'/>
>      <!-- const DBusMessage -->
> -    <qualified-type-def type-id='type-id-57' const='yes'
> id='type-id-148'/>
> +    <qualified-type-def type-id='type-id-53' const='yes'
> id='type-id-157'/>
>      <!-- const DBusMessage* -->
> -    <pointer-type-def type-id='type-id-148' size-in-bits='64'
> id='type-id-149'/>
> +    <pointer-type-def type-id='type-id-157' size-in-bits='64'
> id='type-id-158'/>
>      <!-- dbus_bool_t dbus_message_contains_unix_fds(DBusMessage*) -->
>      <function-decl name='dbus_message_contains_unix_fds'
> mangled-name='dbus_message_contains_unix_fds'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3825' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_contains_unix_fds'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3825' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3825' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
> @@ -2122,57 +2624,57 @@
>      <!-- void* dbus_message_get_data(DBusMessage*, dbus_int32_t) -->
>      <function-decl name='dbus_message_get_data'
> mangled-name='dbus_message_get_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4635' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_data'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4635' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4635' column='1'/>
>        <!-- parameter of type 'typedef dbus_int32_t' -->
> -      <parameter type-id='type-id-52' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4636' column='1'/>
> +      <parameter type-id='type-id-81' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4636' column='1'/>
>        <!-- void* -->
>        <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_set_data(DBusMessage*, dbus_int32_t,
> void*, DBusFreeFunction) -->
>      <function-decl name='dbus_message_set_data'
> mangled-name='dbus_message_set_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4599' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_data'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4599' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4599' column='1'/>
>        <!-- parameter of type 'typedef dbus_int32_t' -->
> -      <parameter type-id='type-id-52' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4600' column='1'/>
> +      <parameter type-id='type-id-81' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4600' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4601' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_func'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4602' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_func'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4602' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_message_free_data_slot(dbus_int32_t*) -->
>      <function-decl name='dbus_message_free_data_slot'
> mangled-name='dbus_message_free_data_slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4578' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_free_data_slot'>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4578' column='1'/>
> +      <parameter type-id='type-id-131' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4578' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_allocate_data_slot(dbus_int32_t*) -->
>      <function-decl name='dbus_message_allocate_data_slot'
> mangled-name='dbus_message_allocate_data_slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4560' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_allocate_data_slot'>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4560' column='1'/>
> +      <parameter type-id='type-id-131' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4560' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_message_ref(DBusMessage*) -->
>      <function-decl name='dbus_message_ref'
> mangled-name='dbus_message_ref'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1667' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_ref'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1667' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1667' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- const char* dbus_message_get_sender(DBusMessage*) -->
>      <function-decl name='dbus_message_get_sender'
> mangled-name='dbus_message_get_sender'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3510' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_sender'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3510' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3510' column='1'/>
>        <!-- const char* -->
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_has_sender(DBusMessage*, const char*)
> -->
>      <function-decl name='dbus_message_has_sender'
> mangled-name='dbus_message_has_sender'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3725' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_has_sender'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3725' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3725' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3726' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2181,14 +2683,14 @@
>      <!-- const char* dbus_message_get_destination(DBusMessage*) -->
>      <function-decl name='dbus_message_get_destination'
> mangled-name='dbus_message_get_destination'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3450' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_destination'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3450' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3450' column='1'/>
>        <!-- const char* -->
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_has_destination(DBusMessage*, const
> char*) -->
>      <function-decl name='dbus_message_has_destination'
> mangled-name='dbus_message_has_destination'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3690' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_has_destination'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3690' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3690' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3691' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2197,21 +2699,21 @@
>      <!-- const char* dbus_message_get_error_name(DBusMessage*) -->
>      <function-decl name='dbus_message_get_error_name'
> mangled-name='dbus_message_get_error_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3397' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_error_name'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3397' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3397' column='1'/>
>        <!-- const char* -->
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <!-- const char* dbus_message_get_member(DBusMessage*) -->
>      <function-decl name='dbus_message_get_member'
> mangled-name='dbus_message_get_member'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3313' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_member'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3313' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3313' column='1'/>
>        <!-- const char* -->
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_has_member(DBusMessage*, const char*)
> -->
>      <function-decl name='dbus_message_has_member'
> mangled-name='dbus_message_has_member'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3335' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_has_member'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3335' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3335' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='member'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3336' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2220,14 +2722,14 @@
>      <!-- const char* dbus_message_get_interface(DBusMessage*) -->
>      <function-decl name='dbus_message_get_interface'
> mangled-name='dbus_message_get_interface'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3227' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_interface'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3227' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3227' column='1'/>
>        <!-- const char* -->
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_has_interface(DBusMessage*, const
> char*) -->
>      <function-decl name='dbus_message_has_interface'
> mangled-name='dbus_message_has_interface'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3249' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_has_interface'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3249' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3249' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='iface'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3250' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2236,14 +2738,14 @@
>      <!-- const char* dbus_message_get_path(DBusMessage*) -->
>      <function-decl name='dbus_message_get_path'
> mangled-name='dbus_message_get_path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3096' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_path'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3096' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3096' column='1'/>
>        <!-- const char* -->
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_has_path(DBusMessage*, const char*) -->
>      <function-decl name='dbus_message_has_path'
> mangled-name='dbus_message_has_path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3120' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_has_path'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3120' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3120' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3121' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2252,21 +2754,21 @@
>      <!-- dbus_uint32_t dbus_message_get_reply_serial(DBusMessage*) -->
>      <function-decl name='dbus_message_get_reply_serial'
> mangled-name='dbus_message_get_reply_serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1163' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_reply_serial'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1163' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1163' column='1'/>
>        <!-- typedef dbus_uint32_t -->
>        <return type-id='type-id-16'/>
>      </function-decl>
>      <!-- const char* dbus_message_get_signature(DBusMessage*) -->
>      <function-decl name='dbus_message_get_signature'
> mangled-name='dbus_message_get_signature'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3543' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_signature'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3543' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3543' column='1'/>
>        <!-- const char* -->
>        <return type-id='type-id-15'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_has_signature(DBusMessage*, const
> char*) -->
>      <function-decl name='dbus_message_has_signature'
> mangled-name='dbus_message_has_signature'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3754' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_has_signature'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3754' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3754' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='signature'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3755' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2275,7 +2777,7 @@
>      <!-- dbus_bool_t dbus_message_set_sender(DBusMessage*, const char*)
> -->
>      <function-decl name='dbus_message_set_sender'
> mangled-name='dbus_message_set_sender'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3479' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_sender'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3479' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3479' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='sender'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3480' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2284,7 +2786,7 @@
>      <!-- dbus_bool_t dbus_message_set_destination(DBusMessage*, const
> char*) -->
>      <function-decl name='dbus_message_set_destination'
> mangled-name='dbus_message_set_destination'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3425' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_destination'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3425' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3425' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='destination'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3426' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2293,7 +2795,7 @@
>      <!-- dbus_bool_t dbus_message_set_reply_serial(DBusMessage*,
> dbus_uint32_t) -->
>      <function-decl name='dbus_message_set_reply_serial'
> mangled-name='dbus_message_set_reply_serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1143' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_reply_serial'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1143' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1143' column='1'/>
>        <!-- parameter of type 'typedef dbus_uint32_t' -->
>        <parameter type-id='type-id-16' name='reply_serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1144' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2302,7 +2804,7 @@
>      <!-- dbus_bool_t dbus_message_set_error_name(DBusMessage*, const
> char*) -->
>      <function-decl name='dbus_message_set_error_name'
> mangled-name='dbus_message_set_error_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3371' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_error_name'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3371' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3371' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='error_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3372' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2311,7 +2813,7 @@
>      <!-- dbus_bool_t dbus_message_set_member(DBusMessage*, const char*)
> -->
>      <function-decl name='dbus_message_set_member'
> mangled-name='dbus_message_set_member'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3286' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_member'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3286' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3286' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='member'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3287' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2320,7 +2822,7 @@
>      <!-- dbus_bool_t dbus_message_set_interface(DBusMessage*, const
> char*) -->
>      <function-decl name='dbus_message_set_interface'
> mangled-name='dbus_message_set_interface'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3198' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_interface'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3198' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3198' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='iface'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3199' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2329,16 +2831,16 @@
>      <!-- dbus_bool_t dbus_message_get_path_decomposed(DBusMessage*,
> char***) -->
>      <function-decl name='dbus_message_get_path_decomposed'
> mangled-name='dbus_message_get_path_decomposed'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3164' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_path_decomposed'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3164' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3164' column='1'/>
>        <!-- parameter of type 'char***' -->
> -      <parameter type-id='type-id-123' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3165' column='1'/>
> +      <parameter type-id='type-id-128' name='path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3165' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_set_path(DBusMessage*, const char*) -->
>      <function-decl name='dbus_message_set_path'
> mangled-name='dbus_message_set_path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3067' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_path'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3067' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3067' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='object_path'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3068' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2347,21 +2849,21 @@
>      <!-- dbus_bool_t dbus_message_get_auto_start(DBusMessage*) -->
>      <function-decl name='dbus_message_get_auto_start'
> mangled-name='dbus_message_get_auto_start'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3045' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_auto_start'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3045' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3045' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_get_no_reply(DBusMessage*) -->
>      <function-decl name='dbus_message_get_no_reply'
> mangled-name='dbus_message_get_no_reply'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3003' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_no_reply'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3003' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3003' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_message_set_auto_start(DBusMessage*, dbus_bool_t) -->
>      <function-decl name='dbus_message_set_auto_start'
> mangled-name='dbus_message_set_auto_start'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3026' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_auto_start'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3026' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3026' column='1'/>
>        <!-- parameter of type 'typedef dbus_bool_t' -->
>        <parameter type-id='type-id-17' name='auto_start'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3027' column='1'/>
>        <!-- void -->
> @@ -2370,7 +2872,7 @@
>      <!-- void dbus_message_set_no_reply(DBusMessage*, dbus_bool_t) -->
>      <function-decl name='dbus_message_set_no_reply'
> mangled-name='dbus_message_set_no_reply'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2984' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_no_reply'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2984' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2984' column='1'/>
>        <!-- parameter of type 'typedef dbus_bool_t' -->
>        <parameter type-id='type-id-17' name='no_reply'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2985' column='1'/>
>        <!-- void -->
> @@ -2379,38 +2881,38 @@
>      <!-- void dbus_message_iter_abandon_container(DBusMessageIter*,
> DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_abandon_container'
> mangled-name='dbus_message_iter_abandon_container'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2951' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_abandon_container'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2951' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2951' column='1'/>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='sub'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2952' column='1'/>
> +      <parameter type-id='type-id-155' name='sub'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2952' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_iter_close_container(DBusMessageIter*,
> DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_close_container'
> mangled-name='dbus_message_iter_close_container'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2918' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_close_container'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2918' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2918' column='1'/>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='sub'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2919' column='1'/>
> +      <parameter type-id='type-id-155' name='sub'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2919' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_iter_open_container(DBusMessageIter*,
> int, const char*, DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_open_container'
> mangled-name='dbus_message_iter_open_container'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2849' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_open_container'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2849' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2849' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2850' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='contained_signature'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2851' column='1'/>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='sub'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2852' column='1'/>
> +      <parameter type-id='type-id-155' name='sub'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2852' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t
> dbus_message_iter_append_fixed_array(DBusMessageIter*, int, void*, int) -->
>      <function-decl name='dbus_message_iter_append_fixed_array'
> mangled-name='dbus_message_iter_append_fixed_array'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2791' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_append_fixed_array'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2791' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2791' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='element_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2792' column='1'/>
>        <!-- parameter of type 'void*' -->
> @@ -2423,7 +2925,7 @@
>      <!-- dbus_bool_t dbus_message_iter_append_basic(DBusMessageIter*,
> int, void*) -->
>      <function-decl name='dbus_message_iter_append_basic'
> mangled-name='dbus_message_iter_append_basic'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2656' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_append_basic'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2656' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2656' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2657' column='1'/>
>        <!-- parameter of type 'void*' -->
> @@ -2434,23 +2936,23 @@
>      <!-- void dbus_message_iter_init_append(DBusMessage*,
> DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_init_append'
> mangled-name='dbus_message_iter_init_append'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2421' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_init_append'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2421' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2421' column='1'/>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2422' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2422' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- int dbus_message_iter_get_arg_type(DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_get_arg_type'
> mangled-name='dbus_message_iter_get_arg_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2139' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_get_arg_type'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2139' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2139' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- void dbus_message_iter_get_fixed_array(DBusMessageIter*, void*,
> int*) -->
>      <function-decl name='dbus_message_iter_get_fixed_array'
> mangled-name='dbus_message_iter_get_fixed_array'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2391' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_get_fixed_array'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2391' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2391' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='value'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2392' column='1'/>
>        <!-- parameter of type 'int*' -->
> @@ -2461,14 +2963,14 @@
>      <!-- int dbus_message_iter_get_array_len(DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_get_array_len'
> mangled-name='dbus_message_iter_get_array_len'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2346' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_get_array_len'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2346' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2346' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- void dbus_message_iter_get_basic(DBusMessageIter*, void*) -->
>      <function-decl name='dbus_message_iter_get_basic'
> mangled-name='dbus_message_iter_get_basic'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2293' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_get_basic'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2293' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2293' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='value'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2294' column='1'/>
>        <!-- void -->
> @@ -2477,64 +2979,64 @@
>      <!-- char* dbus_message_iter_get_signature(DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_get_signature'
> mangled-name='dbus_message_iter_get_signature'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2220' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_get_signature'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2220' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2220' column='1'/>
>        <!-- char* -->
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <!-- void dbus_message_iter_recurse(DBusMessageIter*,
> DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_recurse'
> mangled-name='dbus_message_iter_recurse'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2195' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_recurse'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2195' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2195' column='1'/>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='sub'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2196' column='1'/>
> +      <parameter type-id='type-id-155' name='sub'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2196' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- int dbus_message_iter_get_element_type(DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_get_element_type'
> mangled-name='dbus_message_iter_get_element_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2158' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_get_element_type'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2158' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2158' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_iter_next(DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_next'
> mangled-name='dbus_message_iter_next'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2114' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_next'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2114' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2114' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_iter_has_next(DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_has_next'
> mangled-name='dbus_message_iter_has_next'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2095' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_has_next'>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2095' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2095' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_iter_init(DBusMessage*,
> DBusMessageIter*) -->
>      <function-decl name='dbus_message_iter_init'
> mangled-name='dbus_message_iter_init'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2064' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_iter_init'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2064' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2064' column='1'/>
>        <!-- parameter of type 'DBusMessageIter*' -->
> -      <parameter type-id='type-id-146' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2065' column='1'/>
> +      <parameter type-id='type-id-155' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2065' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_append_args_valist(DBusMessage*, int,
> __va_list_tag*) -->
>      <function-decl name='dbus_message_append_args_valist'
> mangled-name='dbus_message_append_args_valist'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1824' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_append_args_valist'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1824' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1824' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='first_arg_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1825' column='1'/>
>        <!-- parameter of type '__va_list_tag*' -->
> -      <parameter type-id='type-id-147' name='var_args'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1826' column='1'/>
> +      <parameter type-id='type-id-156' name='var_args'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1826' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_append_args(DBusMessage*, int, ...) -->
>      <function-decl name='dbus_message_append_args'
> mangled-name='dbus_message_append_args'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1792' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_append_args'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1792' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1792' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='first_arg_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1793' column='1'/>
>        <parameter is-variadic='yes'/>
> @@ -2544,14 +3046,14 @@
>      <!-- int dbus_message_get_type(DBusMessage*) -->
>      <function-decl name='dbus_message_get_type'
> mangled-name='dbus_message_get_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1722' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_type'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1722' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1722' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_is_error(DBusMessage*, const char*) -->
>      <function-decl name='dbus_message_is_error'
> mangled-name='dbus_message_is_error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3657' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_is_error'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3657' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3657' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='error_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3658' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2560,7 +3062,7 @@
>      <!-- dbus_bool_t dbus_message_is_signal(DBusMessage*, const char*,
> const char*) -->
>      <function-decl name='dbus_message_is_signal'
> mangled-name='dbus_message_is_signal'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3630' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_is_signal'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3630' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3630' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='iface'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3631' column='1'/>
>        <!-- parameter of type 'const char*' -->
> @@ -2571,7 +3073,7 @@
>      <!-- dbus_bool_t dbus_message_is_method_call(DBusMessage*, const
> char*, const char*) -->
>      <function-decl name='dbus_message_is_method_call'
> mangled-name='dbus_message_is_method_call'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3602' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_is_method_call'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3602' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3602' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='iface'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3603' column='1'/>
>        <!-- parameter of type 'const char*' -->
> @@ -2582,7 +3084,7 @@
>      <!-- void dbus_message_unref(DBusMessage*) -->
>      <function-decl name='dbus_message_unref'
> mangled-name='dbus_message_unref'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1690' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_unref'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1690' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1690' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
> @@ -2595,14 +3097,14 @@
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4785' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_message_copy(const DBusMessage*) -->
>      <function-decl name='dbus_message_copy'
> mangled-name='dbus_message_copy'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1587' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_copy'>
>        <!-- parameter of type 'const DBusMessage*' -->
> -      <parameter type-id='type-id-149' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1587' column='1'/>
> +      <parameter type-id='type-id-158' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1587' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_message_new_signal(const char*, const char*,
> const char*) -->
>      <function-decl name='dbus_message_new_signal'
> mangled-name='dbus_message_new_signal'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1424' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_new_signal'>
> @@ -2613,7 +3115,7 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1426' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_message_new_method_call(const char*, const
> char*, const char*, const char*) -->
>      <function-decl name='dbus_message_new_method_call'
> mangled-name='dbus_message_new_method_call'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1333' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_new_method_call'>
> @@ -2626,69 +3128,69 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='method'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1336' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_message_new(int) -->
>      <function-decl name='dbus_message_new'
> mangled-name='dbus_message_new'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1289' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_new'>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='message_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1289' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- dbus_uint32_t dbus_message_get_serial(DBusMessage*) -->
>      <function-decl name='dbus_message_get_serial'
> mangled-name='dbus_message_get_serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1127' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_serial'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1127' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1127' column='1'/>
>        <!-- typedef dbus_uint32_t -->
>        <return type-id='type-id-16'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_message_new_error(DBusMessage*, const char*,
> const char*) -->
>      <function-decl name='dbus_message_new_error'
> mangled-name='dbus_message_new_error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1470' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_new_error'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='reply_to'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1470' column='1'/>
> +      <parameter type-id='type-id-30' name='reply_to'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1470' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='error_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1471' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='error_message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1472' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_message_new_error_printf(DBusMessage*, const
> char*, const char*, ...) -->
>      <function-decl name='dbus_message_new_error_printf'
> mangled-name='dbus_message_new_error_printf'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1542' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_new_error_printf'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='reply_to'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1542' column='1'/>
> +      <parameter type-id='type-id-30' name='reply_to'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1542' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='error_name'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1543' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='error_format'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1544' column='1'/>
>        <parameter is-variadic='yes'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_message_new_method_return(DBusMessage*) -->
>      <function-decl name='dbus_message_new_method_return'
> mangled-name='dbus_message_new_method_return'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1373' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_new_method_return'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='method_call'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1373' column='1'/>
> +      <parameter type-id='type-id-30' name='method_call'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1373' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_get_args_valist(DBusMessage*,
> DBusError*, int, __va_list_tag*) -->
>      <function-decl name='dbus_message_get_args_valist'
> mangled-name='dbus_message_get_args_valist'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2009' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_args_valist'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2009' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2009' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2010' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='first_arg_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2011' column='1'/>
>        <!-- parameter of type '__va_list_tag*' -->
> -      <parameter type-id='type-id-147' name='var_args'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2012' column='1'/>
> +      <parameter type-id='type-id-156' name='var_args'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='2012' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_get_args(DBusMessage*, DBusError*, int,
> ...) -->
>      <function-decl name='dbus_message_get_args'
> mangled-name='dbus_message_get_args'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1980' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_get_args'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1980' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1980' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='1981' column='1'/>
>        <!-- parameter of type 'int' -->
> @@ -2702,23 +3204,23 @@
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3796' column='1'/>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3797' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='3797' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_message_lock(DBusMessage*) -->
>      <function-decl name='dbus_message_lock'
> mangled-name='dbus_message_lock'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='384' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_lock'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='384' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='384' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_message_marshal(DBusMessage*, char**, int*) -->
>      <function-decl name='dbus_message_marshal'
> mangled-name='dbus_message_marshal'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4721' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_marshal'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='msg'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4721' column='1'/>
> +      <parameter type-id='type-id-30' name='msg'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4721' column='1'/>
>        <!-- parameter of type 'char**' -->
> -      <parameter type-id='type-id-122' name='marshalled_data_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4722' column='1'/>
> +      <parameter type-id='type-id-127' name='marshalled_data_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4722' column='1'/>
>        <!-- parameter of type 'int*' -->
>        <parameter type-id='type-id-24' name='len_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='4723' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -2727,7 +3229,7 @@
>      <!-- void dbus_message_set_serial(DBusMessage*, dbus_uint32_t) -->
>      <function-decl name='dbus_message_set_serial'
> mangled-name='dbus_message_set_serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='254' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_message_set_serial'>
>        <!-- parameter of type 'DBusMessage*' -->
> -      <parameter type-id='type-id-111' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='254' column='1'/>
> +      <parameter type-id='type-id-30' name='message'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='254' column='1'/>
>        <!-- parameter of type 'typedef dbus_uint32_t' -->
>        <parameter type-id='type-id-16' name='serial'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c'
> line='255' column='1'/>
>        <!-- void -->
> @@ -2754,104 +3256,104 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-pending-call.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- typedef void (DBusPendingCall*, void*)*
> DBusPendingCallNotifyFunction -->
> -    <typedef-decl name='DBusPendingCallNotifyFunction'
> type-id='type-id-150' filepath='../dbus/dbus-connection.h' line='162'
> column='1' id='type-id-151'/>
> +    <typedef-decl name='DBusPendingCallNotifyFunction'
> type-id='type-id-142' filepath='../dbus/dbus-connection.h' line='162'
> column='1' id='type-id-89'/>
>      <!-- void (DBusPendingCall*, void*)* -->
> -    <pointer-type-def type-id='type-id-152' size-in-bits='64'
> id='type-id-150'/>
> +    <pointer-type-def type-id='type-id-147' size-in-bits='64'
> id='type-id-142'/>
>      <!-- void* dbus_pending_call_get_data(DBusPendingCall*, dbus_int32_t)
> -->
>      <function-decl name='dbus_pending_call_get_data'
> mangled-name='dbus_pending_call_get_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='827' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_get_data'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='827' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='827' column='1'/>
>        <!-- parameter of type 'typedef dbus_int32_t' -->
> -      <parameter type-id='type-id-52' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='828' column='1'/>
> +      <parameter type-id='type-id-81' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='828' column='1'/>
>        <!-- void* -->
>        <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- DBusMessage* dbus_pending_call_steal_reply(DBusPendingCall*) -->
>      <function-decl name='dbus_pending_call_steal_reply'
> mangled-name='dbus_pending_call_steal_reply'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='702' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_steal_reply'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='702' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='702' column='1'/>
>        <!-- DBusMessage* -->
> -      <return type-id='type-id-111'/>
> +      <return type-id='type-id-30'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_pending_call_get_completed(DBusPendingCall*) -->
>      <function-decl name='dbus_pending_call_get_completed'
> mangled-name='dbus_pending_call_get_completed'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='679' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_get_completed'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='679' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='679' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_pending_call_free_data_slot(dbus_int32_t*) -->
>      <function-decl name='dbus_pending_call_free_data_slot'
> mangled-name='dbus_pending_call_free_data_slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='779' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_free_data_slot'>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='779' column='1'/>
> +      <parameter type-id='type-id-131' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='779' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_pending_call_allocate_data_slot(dbus_int32_t*)
> -->
>      <function-decl name='dbus_pending_call_allocate_data_slot'
> mangled-name='dbus_pending_call_allocate_data_slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='759' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_allocate_data_slot'>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='759' column='1'/>
> +      <parameter type-id='type-id-131' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='759' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_pending_call_block(DBusPendingCall*) -->
>      <function-decl name='dbus_pending_call_block'
> mangled-name='dbus_pending_call_block'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='737' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_block'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='737' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='737' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- void dbus_pending_call_cancel(DBusPendingCall*) -->
>      <function-decl name='dbus_pending_call_cancel'
> mangled-name='dbus_pending_call_cancel'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='663' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_cancel'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='663' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='663' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- void dbus_pending_call_unref(DBusPendingCall*) -->
>      <function-decl name='dbus_pending_call_unref'
> mangled-name='dbus_pending_call_unref'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='597' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_unref'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='597' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='597' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- DBusPendingCall* dbus_pending_call_ref(DBusPendingCall*) -->
>      <function-decl name='dbus_pending_call_ref'
> mangled-name='dbus_pending_call_ref'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='577' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_ref'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='577' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='577' column='1'/>
>        <!-- DBusPendingCall* -->
> -      <return type-id='type-id-113'/>
> +      <return type-id='type-id-123'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_pending_call_set_data(DBusPendingCall*,
> dbus_int32_t, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_pending_call_set_data'
> mangled-name='dbus_pending_call_set_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='801' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_set_data'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='801' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='801' column='1'/>
>        <!-- parameter of type 'typedef dbus_int32_t' -->
> -      <parameter type-id='type-id-52' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='802' column='1'/>
> +      <parameter type-id='type-id-81' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='802' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='803' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_func'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='804' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_func'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='804' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_pending_call_set_notify(DBusPendingCall*,
> DBusPendingCallNotifyFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_pending_call_set_notify'
> mangled-name='dbus_pending_call_set_notify'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='622' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_pending_call_set_notify'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='622' column='1'/>
> +      <parameter type-id='type-id-123' name='pending'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='622' column='1'/>
>        <!-- parameter of type 'typedef DBusPendingCallNotifyFunction' -->
> -      <parameter type-id='type-id-151' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='623' column='1'/>
> +      <parameter type-id='type-id-89' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='623' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='624' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='625' column='1'/>
> +      <parameter type-id='type-id-38' name='free_user_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c'
> line='625' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void (DBusPendingCall*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-152'>
> +    <function-type size-in-bits='64' id='type-id-147'>
>        <!-- parameter of type 'DBusPendingCall*' -->
> -      <parameter type-id='type-id-113'/>
> +      <parameter type-id='type-id-123'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- void -->
> @@ -2860,32 +3362,32 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-server.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- char[16] -->
> -    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128'
> id='type-id-153'>
> +    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128'
> id='type-id-159'>
>        <!-- <anonymous range>[16] -->
> -      <subrange length='16' type-id='type-id-27' id='type-id-154'/>
> +      <subrange length='16' type-id='type-id-43' id='type-id-160'/>
>      </array-type-def>
>      <!-- dbus_uint32_t[4] -->
> -    <array-type-def dimensions='1' type-id='type-id-16'
> size-in-bits='128' id='type-id-155'>
> +    <array-type-def dimensions='1' type-id='type-id-16'
> size-in-bits='128' id='type-id-161'>
>        <!-- <anonymous range>[4] -->
> -      <subrange length='4' type-id='type-id-27' id='type-id-156'/>
> +      <subrange length='4' type-id='type-id-43' id='type-id-162'/>
>      </array-type-def>
>      <!-- struct DBusServer -->
> -    <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='57'
> column='1' id='type-id-157'>
> +    <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='57'
> column='1' id='type-id-163'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- DBusAtomic DBusServer::refcount -->
> -        <var-decl name='refcount' type-id='type-id-50'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='58'
> column='1'/>
> +        <var-decl name='refcount' type-id='type-id-26'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='58'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- const DBusServerVTable* DBusServer::vtable -->
> -        <var-decl name='vtable' type-id='type-id-158'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='59'
> column='1'/>
> +        <var-decl name='vtable' type-id='type-id-164'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='59'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- DBusRMutex* DBusServer::mutex -->
> -        <var-decl name='mutex' type-id='type-id-116' visibility='default'
> filepath='../dbus/dbus-server-protected.h' line='60' column='1'/>
> +        <var-decl name='mutex' type-id='type-id-27' visibility='default'
> filepath='../dbus/dbus-server-protected.h' line='60' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <!-- DBusGUID DBusServer::guid -->
> -        <var-decl name='guid' type-id='type-id-159' visibility='default'
> filepath='../dbus/dbus-server-protected.h' line='62' column='1'/>
> +        <var-decl name='guid' type-id='type-id-165' visibility='default'
> filepath='../dbus/dbus-server-protected.h' line='62' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <!-- DBusString DBusServer::guid_hex -->
> @@ -2893,11 +3395,11 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
>          <!-- DBusWatchList* DBusServer::watches -->
> -        <var-decl name='watches' type-id='type-id-121'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='66'
> column='1'/>
> +        <var-decl name='watches' type-id='type-id-33'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='66'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
>          <!-- DBusTimeoutList* DBusServer::timeouts -->
> -        <var-decl name='timeouts' type-id='type-id-118'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='67'
> column='1'/>
> +        <var-decl name='timeouts' type-id='type-id-34'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='67'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
>          <!-- char* DBusServer::address -->
> @@ -2913,11 +3415,11 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
>          <!-- DBusDataSlotList DBusServer::slot_list -->
> -        <var-decl name='slot_list' type-id='type-id-59'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='74'
> column='1'/>
> +        <var-decl name='slot_list' type-id='type-id-35'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='74'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
>          <!-- DBusNewConnectionFunction
> DBusServer::new_connection_function -->
> -        <var-decl name='new_connection_function' type-id='type-id-160'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='76'
> column='1'/>
> +        <var-decl name='new_connection_function' type-id='type-id-166'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='76'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
>          <!-- void* DBusServer::new_connection_data -->
> @@ -2925,11 +3427,11 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
>          <!-- DBusFreeFunction
> DBusServer::new_connection_free_data_function -->
> -        <var-decl name='new_connection_free_data_function'
> type-id='type-id-66' visibility='default'
> filepath='../dbus/dbus-server-protected.h' line='80' column='1'/>
> +        <var-decl name='new_connection_free_data_function'
> type-id='type-id-38' visibility='default'
> filepath='../dbus/dbus-server-protected.h' line='80' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
>          <!-- char** DBusServer::auth_mechanisms -->
> -        <var-decl name='auth_mechanisms' type-id='type-id-122'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='85'
> column='1'/>
> +        <var-decl name='auth_mechanisms' type-id='type-id-127'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='85'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='31'>
>          <!-- unsigned int DBusServer::disconnected -->
> @@ -2941,51 +3443,51 @@
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusServerVTable DBusServerVTable -->
> -    <typedef-decl name='DBusServerVTable' type-id='type-id-161'
> filepath='../dbus/dbus-server-protected.h' line='38' column='1'
> id='type-id-162'/>
> +    <typedef-decl name='DBusServerVTable' type-id='type-id-167'
> filepath='../dbus/dbus-server-protected.h' line='38' column='1'
> id='type-id-168'/>
>      <!-- struct DBusServerVTable -->
> -    <class-decl name='DBusServerVTable' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../dbus/dbus-server-protected.h' line='44' column='1'
> id='type-id-161'>
> +    <class-decl name='DBusServerVTable' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../dbus/dbus-server-protected.h' line='44' column='1'
> id='type-id-167'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- void (DBusServer*)* DBusServerVTable::finalize -->
> -        <var-decl name='finalize' type-id='type-id-163'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='45'
> column='1'/>
> +        <var-decl name='finalize' type-id='type-id-169'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='45'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- void (DBusServer*)* DBusServerVTable::disconnect -->
> -        <var-decl name='disconnect' type-id='type-id-163'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='48'
> column='1'/>
> +        <var-decl name='disconnect' type-id='type-id-169'
> visibility='default' filepath='../dbus/dbus-server-protected.h' line='48'
> column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusServer DBusServer -->
> -    <typedef-decl name='DBusServer' type-id='type-id-157'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h'
> line='42' column='1' id='type-id-164'/>
> +    <typedef-decl name='DBusServer' type-id='type-id-163'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h'
> line='42' column='1' id='type-id-170'/>
>      <!-- typedef DBusGUID DBusGUID -->
> -    <typedef-decl name='DBusGUID' type-id='type-id-165'
> filepath='../dbus/dbus-sysdeps.h' line='507' column='1' id='type-id-159'/>
> +    <typedef-decl name='DBusGUID' type-id='type-id-171'
> filepath='../dbus/dbus-sysdeps.h' line='507' column='1' id='type-id-165'/>
>      <!-- union DBusGUID -->
> -    <union-decl name='DBusGUID' size-in-bits='128' visibility='default'
> filepath='../dbus/dbus-internals.h' line='351' column='1' id='type-id-165'>
> +    <union-decl name='DBusGUID' size-in-bits='128' visibility='default'
> filepath='../dbus/dbus-internals.h' line='351' column='1' id='type-id-171'>
>        <data-member access='private'>
>          <!-- dbus_uint32_t DBusGUID::as_uint32s[4] -->
> -        <var-decl name='as_uint32s' type-id='type-id-155'
> visibility='default' filepath='../dbus/dbus-internals.h' line='352'
> column='1'/>
> +        <var-decl name='as_uint32s' type-id='type-id-161'
> visibility='default' filepath='../dbus/dbus-internals.h' line='352'
> column='1'/>
>        </data-member>
>        <data-member access='private'>
>          <!-- char DBusGUID::as_bytes[16] -->
> -        <var-decl name='as_bytes' type-id='type-id-153'
> visibility='default' filepath='../dbus/dbus-internals.h' line='353'
> column='1'/>
> +        <var-decl name='as_bytes' type-id='type-id-159'
> visibility='default' filepath='../dbus/dbus-internals.h' line='353'
> column='1'/>
>        </data-member>
>      </union-decl>
>      <!-- typedef void (DBusServer*, DBusConnection*, void*)*
> DBusNewConnectionFunction -->
> -    <typedef-decl name='DBusNewConnectionFunction' type-id='type-id-166'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h'
> line='47' column='1' id='type-id-160'/>
> +    <typedef-decl name='DBusNewConnectionFunction' type-id='type-id-172'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h'
> line='47' column='1' id='type-id-166'/>
>      <!-- DBusServer* -->
> -    <pointer-type-def type-id='type-id-164' size-in-bits='64'
> id='type-id-167'/>
> +    <pointer-type-def type-id='type-id-170' size-in-bits='64'
> id='type-id-173'/>
>      <!-- const DBusServerVTable -->
> -    <qualified-type-def type-id='type-id-162' const='yes'
> id='type-id-168'/>
> +    <qualified-type-def type-id='type-id-168' const='yes'
> id='type-id-174'/>
>      <!-- const DBusServerVTable* -->
> -    <pointer-type-def type-id='type-id-168' size-in-bits='64'
> id='type-id-158'/>
> +    <pointer-type-def type-id='type-id-174' size-in-bits='64'
> id='type-id-164'/>
>      <!-- const char** -->
> -    <pointer-type-def type-id='type-id-15' size-in-bits='64'
> id='type-id-169'/>
> +    <pointer-type-def type-id='type-id-15' size-in-bits='64'
> id='type-id-175'/>
>      <!-- void (DBusServer*)* -->
> -    <pointer-type-def type-id='type-id-170' size-in-bits='64'
> id='type-id-163'/>
> +    <pointer-type-def type-id='type-id-176' size-in-bits='64'
> id='type-id-169'/>
>      <!-- void (DBusServer*, DBusConnection*, void*)* -->
> -    <pointer-type-def type-id='type-id-171' size-in-bits='64'
> id='type-id-166'/>
> +    <pointer-type-def type-id='type-id-177' size-in-bits='64'
> id='type-id-172'/>
>      <!-- void* dbus_server_get_data(DBusServer*, int) -->
>      <function-decl name='dbus_server_get_data'
> mangled-name='dbus_server_get_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1156' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_get_data'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1156' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1156' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1157' column='1'/>
>        <!-- void* -->
> @@ -2994,125 +3496,125 @@
>      <!-- void dbus_server_set_new_connection_function(DBusServer*,
> DBusNewConnectionFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_server_set_new_connection_function'
> mangled-name='dbus_server_set_new_connection_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='889' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_set_new_connection_function'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='889' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='889' column='1'/>
>        <!-- parameter of type 'typedef DBusNewConnectionFunction' -->
> -      <parameter type-id='type-id-160' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='890' column='1'/>
> +      <parameter type-id='type-id-166' name='function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='890' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='891' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='892' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='892' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_server_get_is_connected(DBusServer*) -->
>      <function-decl name='dbus_server_get_is_connected'
> mangled-name='dbus_server_get_is_connected'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='797' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_get_is_connected'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='797' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='797' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_server_set_data(DBusServer*, int, void*,
> DBusFreeFunction) -->
>      <function-decl name='dbus_server_set_data'
> mangled-name='dbus_server_set_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1116' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_set_data'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1116' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1116' column='1'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2' name='slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1117' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1118' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_func'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1119' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_func'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1119' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_server_free_data_slot(dbus_int32_t*) -->
>      <function-decl name='dbus_server_free_data_slot'
> mangled-name='dbus_server_free_data_slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1095' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_free_data_slot'>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1095' column='1'/>
> +      <parameter type-id='type-id-131' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1095' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_server_allocate_data_slot(dbus_int32_t*) -->
>      <function-decl name='dbus_server_allocate_data_slot'
> mangled-name='dbus_server_allocate_data_slot'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1077' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_allocate_data_slot'>
>        <!-- parameter of type 'dbus_int32_t*' -->
> -      <parameter type-id='type-id-126' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1077' column='1'/>
> +      <parameter type-id='type-id-131' name='slot_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1077' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_server_set_auth_mechanisms(DBusServer*, const
> char**) -->
>      <function-decl name='dbus_server_set_auth_mechanisms'
> mangled-name='dbus_server_set_auth_mechanisms'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1033' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_set_auth_mechanisms'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1033' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1033' column='1'/>
>        <!-- parameter of type 'const char**' -->
> -      <parameter type-id='type-id-169' name='mechanisms'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1034' column='1'/>
> +      <parameter type-id='type-id-175' name='mechanisms'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='1034' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_server_set_timeout_functions(DBusServer*,
> DBusAddTimeoutFunction, DBusRemoveTimeoutFunction,
> DBusTimeoutToggledFunction, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_server_set_timeout_functions'
> mangled-name='dbus_server_set_timeout_functions'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='982' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_set_timeout_functions'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='982' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='982' column='1'/>
>        <!-- parameter of type 'typedef DBusAddTimeoutFunction' -->
> -      <parameter type-id='type-id-93' name='add_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='983' column='1'/>
> +      <parameter type-id='type-id-109' name='add_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='983' column='1'/>
>        <!-- parameter of type 'typedef DBusRemoveTimeoutFunction' -->
> -      <parameter type-id='type-id-96' name='remove_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='984' column='1'/>
> +      <parameter type-id='type-id-112' name='remove_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='984' column='1'/>
>        <!-- parameter of type 'typedef DBusTimeoutToggledFunction' -->
> -      <parameter type-id='type-id-97' name='toggled_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='985' column='1'/>
> +      <parameter type-id='type-id-113' name='toggled_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='985' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='986' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='987' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='987' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_server_set_watch_functions(DBusServer*,
> DBusAddWatchFunction, DBusRemoveWatchFunction, DBusWatchToggledFunction,
> void*, DBusFreeFunction) -->
>      <function-decl name='dbus_server_set_watch_functions'
> mangled-name='dbus_server_set_watch_functions'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='929' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_set_watch_functions'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='929' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='929' column='1'/>
>        <!-- parameter of type 'typedef DBusAddWatchFunction' -->
> -      <parameter type-id='type-id-99' name='add_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='930' column='1'/>
> +      <parameter type-id='type-id-115' name='add_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='930' column='1'/>
>        <!-- parameter of type 'typedef DBusRemoveWatchFunction' -->
> -      <parameter type-id='type-id-102' name='remove_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='931' column='1'/>
> +      <parameter type-id='type-id-118' name='remove_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='931' column='1'/>
>        <!-- parameter of type 'typedef DBusWatchToggledFunction' -->
> -      <parameter type-id='type-id-103' name='toggled_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='932' column='1'/>
> +      <parameter type-id='type-id-119' name='toggled_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='932' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='933' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='934' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='934' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- char* dbus_server_get_id(DBusServer*) -->
>      <function-decl name='dbus_server_get_id'
> mangled-name='dbus_server_get_id'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='854' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_get_id'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='854' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='854' column='1'/>
>        <!-- char* -->
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <!-- char* dbus_server_get_address(DBusServer*) -->
>      <function-decl name='dbus_server_get_address'
> mangled-name='dbus_server_get_address'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='818' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_get_address'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='818' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='818' column='1'/>
>        <!-- char* -->
>        <return type-id='type-id-22'/>
>      </function-decl>
>      <!-- void dbus_server_unref(DBusServer*) -->
>      <function-decl name='dbus_server_unref'
> mangled-name='dbus_server_unref'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='720' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_unref'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='720' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='720' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- DBusServer* dbus_server_ref(DBusServer*) -->
>      <function-decl name='dbus_server_ref' mangled-name='dbus_server_ref'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='687' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_ref'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='687' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='687' column='1'/>
>        <!-- DBusServer* -->
> -      <return type-id='type-id-167'/>
> +      <return type-id='type-id-173'/>
>      </function-decl>
>      <!-- void dbus_server_disconnect(DBusServer*) -->
>      <function-decl name='dbus_server_disconnect'
> mangled-name='dbus_server_disconnect'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='770' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_server_disconnect'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='770' column='1'/>
> +      <parameter type-id='type-id-173' name='server'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='770' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
> @@ -3123,21 +3625,21 @@
>        <!-- parameter of type 'DBusError*' -->
>        <parameter type-id='type-id-21' name='error'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c'
> line='550' column='1'/>
>        <!-- DBusServer* -->
> -      <return type-id='type-id-167'/>
> +      <return type-id='type-id-173'/>
>      </function-decl>
>      <!-- void (DBusServer*) -->
> -    <function-type size-in-bits='64' id='type-id-170'>
> +    <function-type size-in-bits='64' id='type-id-176'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167'/>
> +      <parameter type-id='type-id-173'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- void (DBusServer*, DBusConnection*, void*) -->
> -    <function-type size-in-bits='64' id='type-id-171'>
> +    <function-type size-in-bits='64' id='type-id-177'>
>        <!-- parameter of type 'DBusServer*' -->
> -      <parameter type-id='type-id-167'/>
> +      <parameter type-id='type-id-173'/>
>        <!-- parameter of type 'DBusConnection*' -->
> -      <parameter type-id='type-id-31'/>
> +      <parameter type-id='type-id-47'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- void -->
> @@ -3146,9 +3648,9 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-signature.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- typedef __anonymous_struct__ DBusSignatureIter -->
> -    <typedef-decl name='DBusSignatureIter' type-id='type-id-172'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h'
> line='51' column='1' id='type-id-173'/>
> +    <typedef-decl name='DBusSignatureIter' type-id='type-id-178'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h'
> line='51' column='1' id='type-id-179'/>
>      <!-- struct {void* dummy1; void* dummy2; dbus_uint32_t dummy8; int
> dummy12; int dummy17;} -->
> -    <class-decl name='__anonymous_struct__' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-173'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h'
> line='45' column='1' id='type-id-172'>
> +    <class-decl name='__anonymous_struct__' size-in-bits='256'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-179'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h'
> line='45' column='1' id='type-id-178'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- void* dummy1 -->
>          <var-decl name='dummy1' type-id='type-id-10' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h'
> line='46' column='1'/>
> @@ -3171,15 +3673,15 @@
>        </data-member>
>      </class-decl>
>      <!-- DBusSignatureIter* -->
> -    <pointer-type-def type-id='type-id-173' size-in-bits='64'
> id='type-id-174'/>
> +    <pointer-type-def type-id='type-id-179' size-in-bits='64'
> id='type-id-180'/>
>      <!-- const DBusSignatureIter -->
> -    <qualified-type-def type-id='type-id-173' const='yes'
> id='type-id-175'/>
> +    <qualified-type-def type-id='type-id-179' const='yes'
> id='type-id-181'/>
>      <!-- const DBusSignatureIter* -->
> -    <pointer-type-def type-id='type-id-175' size-in-bits='64'
> id='type-id-176'/>
> +    <pointer-type-def type-id='type-id-181' size-in-bits='64'
> id='type-id-182'/>
>      <!-- void dbus_signature_iter_init(DBusSignatureIter*, const char*)
> -->
>      <function-decl name='dbus_signature_iter_init'
> mangled-name='dbus_signature_iter_init'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='67' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_signature_iter_init'>
>        <!-- parameter of type 'DBusSignatureIter*' -->
> -      <parameter type-id='type-id-174' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='67' column='1'/>
> +      <parameter type-id='type-id-180' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='67' column='1'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='signature'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='68' column='1'/>
>        <!-- void -->
> @@ -3225,14 +3727,14 @@
>      <!-- dbus_bool_t dbus_signature_iter_next(DBusSignatureIter*) -->
>      <function-decl name='dbus_signature_iter_next'
> mangled-name='dbus_signature_iter_next'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='164' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_signature_iter_next'>
>        <!-- parameter of type 'DBusSignatureIter*' -->
> -      <parameter type-id='type-id-174' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='164' column='1'/>
> +      <parameter type-id='type-id-180' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='164' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- int dbus_signature_iter_get_current_type(const
> DBusSignatureIter*) -->
>      <function-decl name='dbus_signature_iter_get_current_type'
> mangled-name='dbus_signature_iter_get_current_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='92' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_signature_iter_get_current_type'>
>        <!-- parameter of type 'const DBusSignatureIter*' -->
> -      <parameter type-id='type-id-176' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='92' column='1'/>
> +      <parameter type-id='type-id-182' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='92' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
> @@ -3248,23 +3750,23 @@
>      <!-- void dbus_signature_iter_recurse(const DBusSignatureIter*,
> DBusSignatureIter*) -->
>      <function-decl name='dbus_signature_iter_recurse'
> mangled-name='dbus_signature_iter_recurse'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='207' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_signature_iter_recurse'>
>        <!-- parameter of type 'const DBusSignatureIter*' -->
> -      <parameter type-id='type-id-176' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='207' column='1'/>
> +      <parameter type-id='type-id-182' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='207' column='1'/>
>        <!-- parameter of type 'DBusSignatureIter*' -->
> -      <parameter type-id='type-id-174' name='subiter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='208' column='1'/>
> +      <parameter type-id='type-id-180' name='subiter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='208' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- int dbus_signature_iter_get_element_type(const
> DBusSignatureIter*) -->
>      <function-decl name='dbus_signature_iter_get_element_type'
> mangled-name='dbus_signature_iter_get_element_type'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='146' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_signature_iter_get_element_type'>
>        <!-- parameter of type 'const DBusSignatureIter*' -->
> -      <parameter type-id='type-id-176' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='146' column='1'/>
> +      <parameter type-id='type-id-182' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='146' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- char* dbus_signature_iter_get_signature(const
> DBusSignatureIter*) -->
>      <function-decl name='dbus_signature_iter_get_signature'
> mangled-name='dbus_signature_iter_get_signature'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='112' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_signature_iter_get_signature'>
>        <!-- parameter of type 'const DBusSignatureIter*' -->
> -      <parameter type-id='type-id-176' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='112' column='1'/>
> +      <parameter type-id='type-id-182' name='iter'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c'
> line='112' column='1'/>
>        <!-- char* -->
>        <return type-id='type-id-22'/>
>      </function-decl>
> @@ -3338,144 +3840,144 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-threads.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- struct DBusMutex -->
> -    <class-decl name='DBusMutex' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-177'/>
> +    <class-decl name='DBusMutex' is-struct='yes' visibility='default'
> is-declaration-only='yes' id='type-id-183'/>
>      <!-- typedef __anonymous_struct__ DBusThreadFunctions -->
> -    <typedef-decl name='DBusThreadFunctions' type-id='type-id-178'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='178' column='1' id='type-id-179'/>
> +    <typedef-decl name='DBusThreadFunctions' type-id='type-id-184'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='178' column='1' id='type-id-185'/>
>      <!-- struct {unsigned int mask; DBusMutexNewFunction mutex_new;
> DBusMutexFreeFunction mutex_free; DBusMutexLockFunction mutex_lock;
> DBusMutexUnlockFunction mutex_unlock; DBusCondVarNewFunction condvar_new;
> DBusCondVarFreeFunction condvar_free; DBusCondVarWaitFunction condvar_wait;
> DBusCondVarWaitTimeoutFunction condvar_wait_timeout;
> DBusCondVarWakeOneFunction condvar_wake_one; DBusCondVarWakeAllFunction
> condvar_wake_all; DBusRecursiveMutexNewFunction recursive_mutex_new;
> DBusRecursiveMutexFreeFunction recursive_mutex_free;
> DBusRecursiveMutexLockFunction recursive_mutex_lock;
> DBusRecursiveMutexUnlockFunction recursive_mutex_unlock; void ()* padding1;
> void ()* padding2; void ()* padding3; void ()* padding4;} -->
> -    <class-decl name='__anonymous_struct__' size-in-bits='1216'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-179'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='153' column='1' id='type-id-178'>
> +    <class-decl name='__anonymous_struct__' size-in-bits='1216'
> is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-185'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='153' column='1' id='type-id-184'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- unsigned int mask -->
>          <var-decl name='mask' type-id='type-id-3' visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='154' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- DBusMutexNewFunction mutex_new -->
> -        <var-decl name='mutex_new' type-id='type-id-180'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='156' column='1'/>
> +        <var-decl name='mutex_new' type-id='type-id-186'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='156' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- DBusMutexFreeFunction mutex_free -->
> -        <var-decl name='mutex_free' type-id='type-id-181'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='157' column='1'/>
> +        <var-decl name='mutex_free' type-id='type-id-187'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='157' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <!-- DBusMutexLockFunction mutex_lock -->
> -        <var-decl name='mutex_lock' type-id='type-id-182'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='158' column='1'/>
> +        <var-decl name='mutex_lock' type-id='type-id-188'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='158' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <!-- DBusMutexUnlockFunction mutex_unlock -->
> -        <var-decl name='mutex_unlock' type-id='type-id-183'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='159' column='1'/>
> +        <var-decl name='mutex_unlock' type-id='type-id-189'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='159' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <!-- DBusCondVarNewFunction condvar_new -->
> -        <var-decl name='condvar_new' type-id='type-id-184'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='161' column='1'/>
> +        <var-decl name='condvar_new' type-id='type-id-190'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='161' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <!-- DBusCondVarFreeFunction condvar_free -->
> -        <var-decl name='condvar_free' type-id='type-id-185'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='162' column='1'/>
> +        <var-decl name='condvar_free' type-id='type-id-191'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='162' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <!-- DBusCondVarWaitFunction condvar_wait -->
> -        <var-decl name='condvar_wait' type-id='type-id-186'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='163' column='1'/>
> +        <var-decl name='condvar_wait' type-id='type-id-192'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='163' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
>          <!-- DBusCondVarWaitTimeoutFunction condvar_wait_timeout -->
> -        <var-decl name='condvar_wait_timeout' type-id='type-id-187'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='164' column='1'/>
> +        <var-decl name='condvar_wait_timeout' type-id='type-id-193'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='164' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
>          <!-- DBusCondVarWakeOneFunction condvar_wake_one -->
> -        <var-decl name='condvar_wake_one' type-id='type-id-188'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='165' column='1'/>
> +        <var-decl name='condvar_wake_one' type-id='type-id-194'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='165' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
>          <!-- DBusCondVarWakeAllFunction condvar_wake_all -->
> -        <var-decl name='condvar_wake_all' type-id='type-id-189'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='166' column='1'/>
> +        <var-decl name='condvar_wake_all' type-id='type-id-195'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='166' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
>          <!-- DBusRecursiveMutexNewFunction recursive_mutex_new -->
> -        <var-decl name='recursive_mutex_new' type-id='type-id-190'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='168' column='1'/>
> +        <var-decl name='recursive_mutex_new' type-id='type-id-196'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='168' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='768'>
>          <!-- DBusRecursiveMutexFreeFunction recursive_mutex_free -->
> -        <var-decl name='recursive_mutex_free' type-id='type-id-191'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='169' column='1'/>
> +        <var-decl name='recursive_mutex_free' type-id='type-id-197'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='169' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='832'>
>          <!-- DBusRecursiveMutexLockFunction recursive_mutex_lock -->
> -        <var-decl name='recursive_mutex_lock' type-id='type-id-192'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='170' column='1'/>
> +        <var-decl name='recursive_mutex_lock' type-id='type-id-198'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='170' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='896'>
>          <!-- DBusRecursiveMutexUnlockFunction recursive_mutex_unlock -->
> -        <var-decl name='recursive_mutex_unlock' type-id='type-id-193'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='171' column='1'/>
> +        <var-decl name='recursive_mutex_unlock' type-id='type-id-199'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='171' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='960'>
>          <!-- void ()* padding1 -->
> -        <var-decl name='padding1' type-id='type-id-194'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='173' column='1'/>
> +        <var-decl name='padding1' type-id='type-id-200'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='173' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1024'>
>          <!-- void ()* padding2 -->
> -        <var-decl name='padding2' type-id='type-id-194'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='174' column='1'/>
> +        <var-decl name='padding2' type-id='type-id-200'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='174' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
>          <!-- void ()* padding3 -->
> -        <var-decl name='padding3' type-id='type-id-194'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='175' column='1'/>
> +        <var-decl name='padding3' type-id='type-id-200'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='175' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
>          <!-- void ()* padding4 -->
> -        <var-decl name='padding4' type-id='type-id-194'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='176' column='1'/>
> +        <var-decl name='padding4' type-id='type-id-200'
> visibility='default'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='176' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef DBusMutex* ()* DBusMutexNewFunction -->
> -    <typedef-decl name='DBusMutexNewFunction' type-id='type-id-195'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='46' column='1' id='type-id-180'/>
> +    <typedef-decl name='DBusMutexNewFunction' type-id='type-id-201'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='46' column='1' id='type-id-186'/>
>      <!-- typedef DBusMutex DBusMutex -->
> -    <typedef-decl name='DBusMutex' type-id='type-id-177'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='41' column='1' id='type-id-196'/>
> +    <typedef-decl name='DBusMutex' type-id='type-id-183'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='41' column='1' id='type-id-202'/>
>      <!-- typedef void (DBusMutex*)* DBusMutexFreeFunction -->
> -    <typedef-decl name='DBusMutexFreeFunction' type-id='type-id-197'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='48' column='1' id='type-id-181'/>
> +    <typedef-decl name='DBusMutexFreeFunction' type-id='type-id-203'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='48' column='1' id='type-id-187'/>
>      <!-- typedef typedef dbus_bool_t (DBusMutex*)* DBusMutexLockFunction
> -->
> -    <typedef-decl name='DBusMutexLockFunction' type-id='type-id-198'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='50' column='1' id='type-id-182'/>
> +    <typedef-decl name='DBusMutexLockFunction' type-id='type-id-204'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='50' column='1' id='type-id-188'/>
>      <!-- typedef typedef dbus_bool_t (DBusMutex*)*
> DBusMutexUnlockFunction -->
> -    <typedef-decl name='DBusMutexUnlockFunction' type-id='type-id-198'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='52' column='1' id='type-id-183'/>
> +    <typedef-decl name='DBusMutexUnlockFunction' type-id='type-id-204'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='52' column='1' id='type-id-189'/>
>      <!-- typedef DBusCondVar* ()* DBusCondVarNewFunction -->
> -    <typedef-decl name='DBusCondVarNewFunction' type-id='type-id-199'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='77' column='1' id='type-id-184'/>
> +    <typedef-decl name='DBusCondVarNewFunction' type-id='type-id-205'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='77' column='1' id='type-id-190'/>
>      <!-- typedef void (DBusCondVar*)* DBusCondVarFreeFunction -->
> -    <typedef-decl name='DBusCondVarFreeFunction' type-id='type-id-200'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='80' column='1' id='type-id-185'/>
> +    <typedef-decl name='DBusCondVarFreeFunction' type-id='type-id-206'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='80' column='1' id='type-id-191'/>
>      <!-- typedef void (DBusCondVar*, DBusMutex*)* DBusCondVarWaitFunction
> -->
> -    <typedef-decl name='DBusCondVarWaitFunction' type-id='type-id-201'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='92' column='1' id='type-id-186'/>
> +    <typedef-decl name='DBusCondVarWaitFunction' type-id='type-id-207'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='92' column='1' id='type-id-192'/>
>      <!-- typedef typedef dbus_bool_t (DBusCondVar*, DBusMutex*, int)*
> DBusCondVarWaitTimeoutFunction -->
> -    <typedef-decl name='DBusCondVarWaitTimeoutFunction'
> type-id='type-id-202'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='101' column='1' id='type-id-187'/>
> +    <typedef-decl name='DBusCondVarWaitTimeoutFunction'
> type-id='type-id-208'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='101' column='1' id='type-id-193'/>
>      <!-- typedef void (DBusCondVar*)* DBusCondVarWakeOneFunction -->
> -    <typedef-decl name='DBusCondVarWakeOneFunction' type-id='type-id-200'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='108' column='1' id='type-id-188'/>
> +    <typedef-decl name='DBusCondVarWakeOneFunction' type-id='type-id-206'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='108' column='1' id='type-id-194'/>
>      <!-- typedef void (DBusCondVar*)* DBusCondVarWakeAllFunction -->
> -    <typedef-decl name='DBusCondVarWakeAllFunction' type-id='type-id-200'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='114' column='1' id='type-id-189'/>
> +    <typedef-decl name='DBusCondVarWakeAllFunction' type-id='type-id-206'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='114' column='1' id='type-id-195'/>
>      <!-- typedef DBusMutex* ()* DBusRecursiveMutexNewFunction -->
> -    <typedef-decl name='DBusRecursiveMutexNewFunction'
> type-id='type-id-195'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='61' column='1' id='type-id-190'/>
> +    <typedef-decl name='DBusRecursiveMutexNewFunction'
> type-id='type-id-201'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='61' column='1' id='type-id-196'/>
>      <!-- typedef void (DBusMutex*)* DBusRecursiveMutexFreeFunction -->
> -    <typedef-decl name='DBusRecursiveMutexFreeFunction'
> type-id='type-id-197'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='64' column='1' id='type-id-191'/>
> +    <typedef-decl name='DBusRecursiveMutexFreeFunction'
> type-id='type-id-203'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='64' column='1' id='type-id-197'/>
>      <!-- typedef void (DBusMutex*)* DBusRecursiveMutexLockFunction -->
> -    <typedef-decl name='DBusRecursiveMutexLockFunction'
> type-id='type-id-197'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='68' column='1' id='type-id-192'/>
> +    <typedef-decl name='DBusRecursiveMutexLockFunction'
> type-id='type-id-203'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='68' column='1' id='type-id-198'/>
>      <!-- typedef void (DBusMutex*)* DBusRecursiveMutexUnlockFunction -->
> -    <typedef-decl name='DBusRecursiveMutexUnlockFunction'
> type-id='type-id-197'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='72' column='1' id='type-id-193'/>
> +    <typedef-decl name='DBusRecursiveMutexUnlockFunction'
> type-id='type-id-203'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h'
> line='72' column='1' id='type-id-199'/>
>      <!-- DBusCondVar* ()* -->
> -    <pointer-type-def type-id='type-id-203' size-in-bits='64'
> id='type-id-199'/>
> +    <pointer-type-def type-id='type-id-209' size-in-bits='64'
> id='type-id-205'/>
>      <!-- DBusMutex* -->
> -    <pointer-type-def type-id='type-id-196' size-in-bits='64'
> id='type-id-204'/>
> +    <pointer-type-def type-id='type-id-202' size-in-bits='64'
> id='type-id-210'/>
>      <!-- DBusMutex* ()* -->
> -    <pointer-type-def type-id='type-id-205' size-in-bits='64'
> id='type-id-195'/>
> +    <pointer-type-def type-id='type-id-211' size-in-bits='64'
> id='type-id-201'/>
>      <!-- const DBusThreadFunctions -->
> -    <qualified-type-def type-id='type-id-179' const='yes'
> id='type-id-206'/>
> +    <qualified-type-def type-id='type-id-185' const='yes'
> id='type-id-212'/>
>      <!-- const DBusThreadFunctions* -->
> -    <pointer-type-def type-id='type-id-206' size-in-bits='64'
> id='type-id-207'/>
> +    <pointer-type-def type-id='type-id-212' size-in-bits='64'
> id='type-id-213'/>
>      <!-- typedef dbus_bool_t (DBusCondVar*, DBusMutex*, int)* -->
> -    <pointer-type-def type-id='type-id-208' size-in-bits='64'
> id='type-id-202'/>
> +    <pointer-type-def type-id='type-id-214' size-in-bits='64'
> id='type-id-208'/>
>      <!-- typedef dbus_bool_t (DBusMutex*)* -->
> -    <pointer-type-def type-id='type-id-209' size-in-bits='64'
> id='type-id-198'/>
> +    <pointer-type-def type-id='type-id-215' size-in-bits='64'
> id='type-id-204'/>
>      <!-- void ()* -->
> -    <pointer-type-def type-id='type-id-210' size-in-bits='64'
> id='type-id-194'/>
> +    <pointer-type-def type-id='type-id-216' size-in-bits='64'
> id='type-id-200'/>
>      <!-- void (DBusCondVar*)* -->
> -    <pointer-type-def type-id='type-id-211' size-in-bits='64'
> id='type-id-200'/>
> +    <pointer-type-def type-id='type-id-217' size-in-bits='64'
> id='type-id-206'/>
>      <!-- void (DBusCondVar*, DBusMutex*)* -->
> -    <pointer-type-def type-id='type-id-212' size-in-bits='64'
> id='type-id-201'/>
> +    <pointer-type-def type-id='type-id-218' size-in-bits='64'
> id='type-id-207'/>
>      <!-- void (DBusMutex*)* -->
> -    <pointer-type-def type-id='type-id-213' size-in-bits='64'
> id='type-id-197'/>
> +    <pointer-type-def type-id='type-id-219' size-in-bits='64'
> id='type-id-203'/>
>      <!-- dbus_bool_t dbus_threads_init(const DBusThreadFunctions*) -->
>      <function-decl name='dbus_threads_init'
> mangled-name='dbus_threads_init'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.c'
> line='391' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_threads_init'>
>        <!-- parameter of type 'const DBusThreadFunctions*' -->
> -      <parameter type-id='type-id-207' name='functions'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.c'
> line='391' column='1'/>
> +      <parameter type-id='type-id-213' name='functions'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.c'
> line='391' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
> @@ -3485,108 +3987,108 @@
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- DBusCondVar* () -->
> -    <function-type size-in-bits='64' id='type-id-203'>
> +    <function-type size-in-bits='64' id='type-id-209'>
>        <!-- DBusCondVar* -->
> -      <return type-id='type-id-108'/>
> +      <return type-id='type-id-29'/>
>      </function-type>
>      <!-- DBusMutex* () -->
> -    <function-type size-in-bits='64' id='type-id-205'>
> +    <function-type size-in-bits='64' id='type-id-211'>
>        <!-- DBusMutex* -->
> -      <return type-id='type-id-204'/>
> +      <return type-id='type-id-210'/>
>      </function-type>
>      <!-- dbus_bool_t (DBusCondVar*, DBusMutex*, int) -->
> -    <function-type size-in-bits='64' id='type-id-208'>
> +    <function-type size-in-bits='64' id='type-id-214'>
>        <!-- parameter of type 'DBusCondVar*' -->
> -      <parameter type-id='type-id-108'/>
> +      <parameter type-id='type-id-29'/>
>        <!-- parameter of type 'DBusMutex*' -->
> -      <parameter type-id='type-id-204'/>
> +      <parameter type-id='type-id-210'/>
>        <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-2'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-type>
>      <!-- dbus_bool_t (DBusMutex*) -->
> -    <function-type size-in-bits='64' id='type-id-209'>
> +    <function-type size-in-bits='64' id='type-id-215'>
>        <!-- parameter of type 'DBusMutex*' -->
> -      <parameter type-id='type-id-204'/>
> +      <parameter type-id='type-id-210'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-type>
>      <!-- void () -->
> -    <function-type size-in-bits='64' id='type-id-210'>
> +    <function-type size-in-bits='64' id='type-id-216'>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- void (DBusCondVar*) -->
> -    <function-type size-in-bits='64' id='type-id-211'>
> +    <function-type size-in-bits='64' id='type-id-217'>
>        <!-- parameter of type 'DBusCondVar*' -->
> -      <parameter type-id='type-id-108'/>
> +      <parameter type-id='type-id-29'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- void (DBusCondVar*, DBusMutex*) -->
> -    <function-type size-in-bits='64' id='type-id-212'>
> +    <function-type size-in-bits='64' id='type-id-218'>
>        <!-- parameter of type 'DBusCondVar*' -->
> -      <parameter type-id='type-id-108'/>
> +      <parameter type-id='type-id-29'/>
>        <!-- parameter of type 'DBusMutex*' -->
> -      <parameter type-id='type-id-204'/>
> +      <parameter type-id='type-id-210'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- void (DBusMutex*) -->
> -    <function-type size-in-bits='64' id='type-id-213'>
> +    <function-type size-in-bits='64' id='type-id-219'>
>        <!-- parameter of type 'DBusMutex*' -->
> -      <parameter type-id='type-id-204'/>
> +      <parameter type-id='type-id-210'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-timeout.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- typedef typedef dbus_bool_t (void*)* DBusTimeoutHandler -->
> -    <typedef-decl name='DBusTimeoutHandler' type-id='type-id-214'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h'
> line='41' column='1' id='type-id-215'/>
> +    <typedef-decl name='DBusTimeoutHandler' type-id='type-id-143'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h'
> line='41' column='1' id='type-id-92'/>
>      <!-- typedef dbus_bool_t (void*)* -->
> -    <pointer-type-def type-id='type-id-216' size-in-bits='64'
> id='type-id-214'/>
> +    <pointer-type-def type-id='type-id-146' size-in-bits='64'
> id='type-id-143'/>
>      <!-- int dbus_timeout_get_interval(DBusTimeout*) -->
>      <function-decl name='dbus_timeout_get_interval'
> mangled-name='dbus_timeout_get_interval'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='416' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_timeout_get_interval'>
>        <!-- parameter of type 'DBusTimeout*' -->
> -      <parameter type-id='type-id-117' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='416' column='1'/>
> +      <parameter type-id='type-id-90' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='416' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- void* dbus_timeout_get_data(DBusTimeout*) -->
>      <function-decl name='dbus_timeout_get_data'
> mangled-name='dbus_timeout_get_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='429' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_timeout_get_data'>
>        <!-- parameter of type 'DBusTimeout*' -->
> -      <parameter type-id='type-id-117' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='429' column='1'/>
> +      <parameter type-id='type-id-90' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='429' column='1'/>
>        <!-- void* -->
>        <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void dbus_timeout_set_data(DBusTimeout*, void*,
> DBusFreeFunction) -->
>      <function-decl name='dbus_timeout_set_data'
> mangled-name='dbus_timeout_set_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='446' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_timeout_set_data'>
>        <!-- parameter of type 'DBusTimeout*' -->
> -      <parameter type-id='type-id-117' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='446' column='1'/>
> +      <parameter type-id='type-id-90' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='446' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='447' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='448' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='448' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_timeout_handle(DBusTimeout*) -->
>      <function-decl name='dbus_timeout_handle'
> mangled-name='dbus_timeout_handle'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='472' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_timeout_handle'>
>        <!-- parameter of type 'DBusTimeout*' -->
> -      <parameter type-id='type-id-117' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='472' column='1'/>
> +      <parameter type-id='type-id-90' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='472' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t dbus_timeout_get_enabled(DBusTimeout*) -->
>      <function-decl name='dbus_timeout_get_enabled'
> mangled-name='dbus_timeout_get_enabled'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='486' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_timeout_get_enabled'>
>        <!-- parameter of type 'DBusTimeout*' -->
> -      <parameter type-id='type-id-117' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='486' column='1'/>
> +      <parameter type-id='type-id-90' name='timeout'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c'
> line='486' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- dbus_bool_t (void*) -->
> -    <function-type size-in-bits='64' id='type-id-216'>
> +    <function-type size-in-bits='64' id='type-id-146'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10'/>
>        <!-- typedef dbus_bool_t -->
> @@ -3597,7 +4099,7 @@
>      <!-- dbus_bool_t dbus_internal_do_not_use_create_uuid(char**) -->
>      <function-decl name='dbus_internal_do_not_use_create_uuid'
> mangled-name='dbus_internal_do_not_use_create_uuid'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c'
> line='122' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_internal_do_not_use_create_uuid'>
>        <!-- parameter of type 'char**' -->
> -      <parameter type-id='type-id-122' name='uuid_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c'
> line='122' column='1'/>
> +      <parameter type-id='type-id-127' name='uuid_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c'
> line='122' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
> @@ -3606,7 +4108,7 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-15' name='filename'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c'
> line='83' column='1'/>
>        <!-- parameter of type 'char**' -->
> -      <parameter type-id='type-id-122' name='uuid_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c'
> line='84' column='1'/>
> +      <parameter type-id='type-id-127' name='uuid_p'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c'
> line='84' column='1'/>
>        <!-- parameter of type 'typedef dbus_bool_t' -->
>        <parameter type-id='type-id-17' name='create_if_not_found'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c'
> line='85' column='1'/>
>        <!-- parameter of type 'DBusError*' -->
> @@ -3617,13 +4119,13 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64' path='dbus-watch.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus'
> language='LANG_C89'>
>      <!-- typedef typedef dbus_bool_t (DBusWatch*, unsigned int, void*)*
> DBusWatchHandler -->
> -    <typedef-decl name='DBusWatchHandler' type-id='type-id-217'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h'
> line='43' column='1' id='type-id-218'/>
> +    <typedef-decl name='DBusWatchHandler' type-id='type-id-144'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h'
> line='43' column='1' id='type-id-94'/>
>      <!-- typedef dbus_bool_t (DBusWatch*, unsigned int, void*)* -->
> -    <pointer-type-def type-id='type-id-219' size-in-bits='64'
> id='type-id-217'/>
> +    <pointer-type-def type-id='type-id-145' size-in-bits='64'
> id='type-id-144'/>
>      <!-- dbus_bool_t dbus_watch_handle(DBusWatch*, unsigned int) -->
>      <function-decl name='dbus_watch_handle'
> mangled-name='dbus_watch_handle'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='698' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_watch_handle'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='698' column='1'/>
> +      <parameter type-id='type-id-126' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='698' column='1'/>
>        <!-- parameter of type 'unsigned int' -->
>        <parameter type-id='type-id-3' name='flags'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='699' column='1'/>
>        <!-- typedef dbus_bool_t -->
> @@ -3632,60 +4134,60 @@
>      <!-- dbus_bool_t dbus_watch_get_enabled(DBusWatch*) -->
>      <function-decl name='dbus_watch_get_enabled'
> mangled-name='dbus_watch_get_enabled'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='667' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_watch_get_enabled'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='667' column='1'/>
> +      <parameter type-id='type-id-126' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='667' column='1'/>
>        <!-- typedef dbus_bool_t -->
>        <return type-id='type-id-17'/>
>      </function-decl>
>      <!-- void dbus_watch_set_data(DBusWatch*, void*, DBusFreeFunction) -->
>      <function-decl name='dbus_watch_set_data'
> mangled-name='dbus_watch_set_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='642' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_watch_set_data'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='642' column='1'/>
> +      <parameter type-id='type-id-126' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='642' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-10' name='data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='643' column='1'/>
>        <!-- parameter of type 'typedef DBusFreeFunction' -->
> -      <parameter type-id='type-id-66' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='644' column='1'/>
> +      <parameter type-id='type-id-38' name='free_data_function'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='644' column='1'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-decl>
>      <!-- void* dbus_watch_get_data(DBusWatch*) -->
>      <function-decl name='dbus_watch_get_data'
> mangled-name='dbus_watch_get_data'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='623' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_watch_get_data'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='623' column='1'/>
> +      <parameter type-id='type-id-126' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='623' column='1'/>
>        <!-- void* -->
>        <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- unsigned int dbus_watch_get_flags(DBusWatch*) -->
>      <function-decl name='dbus_watch_get_flags'
> mangled-name='dbus_watch_get_flags'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='607' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_watch_get_flags'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='607' column='1'/>
> +      <parameter type-id='type-id-126' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='607' column='1'/>
>        <!-- unsigned int -->
>        <return type-id='type-id-3'/>
>      </function-decl>
>      <!-- int dbus_watch_get_socket(DBusWatch*) -->
>      <function-decl name='dbus_watch_get_socket'
> mangled-name='dbus_watch_get_socket'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='586' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_watch_get_socket'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='586' column='1'/>
> +      <parameter type-id='type-id-126' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='586' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- int dbus_watch_get_unix_fd(DBusWatch*) -->
>      <function-decl name='dbus_watch_get_unix_fd'
> mangled-name='dbus_watch_get_unix_fd'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='557' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_watch_get_unix_fd'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='557' column='1'/>
> +      <parameter type-id='type-id-126' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='557' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- int dbus_watch_get_fd(DBusWatch*) -->
>      <function-decl name='dbus_watch_get_fd'
> mangled-name='dbus_watch_get_fd'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='536' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='dbus_watch_get_fd'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='536' column='1'/>
> +      <parameter type-id='type-id-126' name='watch'
> filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c'
> line='536' column='1'/>
>        <!-- int -->
>        <return type-id='type-id-2'/>
>      </function-decl>
>      <!-- dbus_bool_t (DBusWatch*, unsigned int, void*) -->
> -    <function-type size-in-bits='64' id='type-id-219'>
> +    <function-type size-in-bits='64' id='type-id-145'>
>        <!-- parameter of type 'DBusWatch*' -->
> -      <parameter type-id='type-id-120'/>
> +      <parameter type-id='type-id-126'/>
>        <!-- parameter of type 'unsigned int' -->
>        <parameter type-id='type-id-3'/>
>        <!-- parameter of type 'void*' -->
> diff --git a/tests/data/test-annotate/test15-pr18892.so.abi
> b/tests/data/test-annotate/test15-pr18892.so.abi
> index 4da280eb..9e220f88 100644
> --- a/tests/data/test-annotate/test15-pr18892.so.abi
> +++ b/tests/data/test-annotate/test15-pr18892.so.abi
> @@ -3062,16 +3062,25 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace'
> language='LANG_C89'>
>      <!-- struct backtrace_freelist_struct -->
> -    <class-decl name='backtrace_freelist_struct' size-in-bits='128'
> is-struct='yes' visibility='default' is-declaration-only='yes'
> id='type-id-6'/>
> +    <class-decl name='backtrace_freelist_struct' size-in-bits='128'
> is-struct='yes' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c'
> line='55' column='1' id='type-id-6'>
> +      <data-member access='public' layout-offset-in-bits='0'>
> +        <!-- backtrace_freelist_struct* backtrace_freelist_struct::next
> -->
> +        <var-decl name='next' type-id='type-id-7' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c'
> line='58' column='1'/>
> +      </data-member>
> +      <data-member access='public' layout-offset-in-bits='64'>
> +        <!-- size_t backtrace_freelist_struct::size -->
> +        <var-decl name='size' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c'
> line='60' column='1'/>
> +      </data-member>
> +    </class-decl>
>      <!-- struct backtrace_state -->
> -    <class-decl name='backtrace_state' size-in-bits='576' is-struct='yes'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='127' column='1' id='type-id-7'>
> +    <class-decl name='backtrace_state' size-in-bits='576' is-struct='yes'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='127' column='1' id='type-id-9'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- const char* backtrace_state::filename -->
>          <var-decl name='filename' type-id='type-id-2'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='130' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int backtrace_state::threaded -->
> -        <var-decl name='threaded' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='132' column='1'/>
> +        <var-decl name='threaded' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='132' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- void* backtrace_state::lock -->
> @@ -3079,7 +3088,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <!-- fileline backtrace_state::fileline_fn -->
> -        <var-decl name='fileline_fn' type-id='type-id-9'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='138' column='1'/>
> +        <var-decl name='fileline_fn' type-id='type-id-11'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='138' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='256'>
>          <!-- void* backtrace_state::fileline_data -->
> @@ -3087,7 +3096,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <!-- syminfo backtrace_state::syminfo_fn -->
> -        <var-decl name='syminfo_fn' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='142' column='1'/>
> +        <var-decl name='syminfo_fn' type-id='type-id-12'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='142' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <!-- void* backtrace_state::syminfo_data -->
> @@ -3095,54 +3104,54 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <!-- int backtrace_state::fileline_initialization_failed -->
> -        <var-decl name='fileline_initialization_failed'
> type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='146' column='1'/>
> +        <var-decl name='fileline_initialization_failed'
> type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='146' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='480'>
>          <!-- int backtrace_state::lock_alloc -->
> -        <var-decl name='lock_alloc' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='148' column='1'/>
> +        <var-decl name='lock_alloc' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='148' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
>          <!-- backtrace_freelist_struct* backtrace_state::freelist -->
> -        <var-decl name='freelist' type-id='type-id-11'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='150' column='1'/>
> +        <var-decl name='freelist' type-id='type-id-7'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='150' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef int (backtrace_state*, typedef uintptr_t, typedef
> backtrace_full_callback, typedef backtrace_error_callback, void*)* fileline
> -->
> -    <typedef-decl name='fileline' type-id='type-id-12'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='114' column='1' id='type-id-9'/>
> +    <typedef-decl name='fileline' type-id='type-id-13'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='114' column='1' id='type-id-11'/>
>      <!-- typedef void (backtrace_state*, typedef uintptr_t, typedef
> backtrace_syminfo_callback, typedef backtrace_error_callback, void*)*
> syminfo -->
> -    <typedef-decl name='syminfo' type-id='type-id-13'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='121' column='1' id='type-id-10'/>
> +    <typedef-decl name='syminfo' type-id='type-id-14'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='121' column='1' id='type-id-12'/>
>      <!-- struct backtrace_vector -->
> -    <class-decl name='backtrace_vector' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='221' column='1' id='type-id-14'>
> +    <class-decl name='backtrace_vector' size-in-bits='192'
> is-struct='yes' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='221' column='1' id='type-id-15'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- void* backtrace_vector::base -->
>          <var-decl name='base' type-id='type-id-1' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='224' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- size_t backtrace_vector::size -->
> -        <var-decl name='size' type-id='type-id-15' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='226' column='1'/>
> +        <var-decl name='size' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='226' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- size_t backtrace_vector::alc -->
> -        <var-decl name='alc' type-id='type-id-15' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='228' column='1'/>
> +        <var-decl name='alc' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='228' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- typedef int (void*, void*)* __compar_fn_t -->
>      <typedef-decl name='__compar_fn_t' type-id='type-id-16'
> filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-17'/>
>      <!-- backtrace_freelist_struct* -->
> -    <pointer-type-def type-id='type-id-6' size-in-bits='64'
> id='type-id-11'/>
> +    <pointer-type-def type-id='type-id-6' size-in-bits='64'
> id='type-id-7'/>
>      <!-- backtrace_state* -->
> -    <pointer-type-def type-id='type-id-7' size-in-bits='64'
> id='type-id-18'/>
> +    <pointer-type-def type-id='type-id-9' size-in-bits='64'
> id='type-id-18'/>
>      <!-- backtrace_vector* -->
> -    <pointer-type-def type-id='type-id-14' size-in-bits='64'
> id='type-id-19'/>
> +    <pointer-type-def type-id='type-id-15' size-in-bits='64'
> id='type-id-19'/>
>      <!-- const unsigned char -->
>      <qualified-type-def type-id='type-id-20' const='yes' id='type-id-21'/>
>      <!-- const unsigned char* -->
>      <pointer-type-def type-id='type-id-21' size-in-bits='64'
> id='type-id-22'/>
>      <!-- fileline* -->
> -    <pointer-type-def type-id='type-id-9' size-in-bits='64'
> id='type-id-23'/>
> +    <pointer-type-def type-id='type-id-11' size-in-bits='64'
> id='type-id-23'/>
>      <!-- int (backtrace_state*, typedef uintptr_t, typedef
> backtrace_full_callback, typedef backtrace_error_callback, void*)* -->
> -    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-12'/>
> +    <pointer-type-def type-id='type-id-24' size-in-bits='64'
> id='type-id-13'/>
>      <!-- void (backtrace_state*, typedef uintptr_t, typedef
> backtrace_syminfo_callback, typedef backtrace_error_callback, void*)* -->
> -    <pointer-type-def type-id='type-id-25' size-in-bits='64'
> id='type-id-13'/>
> +    <pointer-type-def type-id='type-id-25' size-in-bits='64'
> id='type-id-14'/>
>      <!-- int __asan_backtrace_dwarf_add(backtrace_state*, uintptr_t,
> const unsigned char*, size_t, const unsigned char*, size_t, const unsigned
> char*, size_t, const unsigned char*, size_t, const unsigned char*, size_t,
> int, backtrace_error_callback, void*, fileline*) -->
>      <function-decl name='__asan_backtrace_dwarf_add'
> mangled-name='__asan_backtrace_dwarf_add'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2958' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_dwarf_add'>
>        <!-- parameter of type 'backtrace_state*' -->
> @@ -3152,25 +3161,25 @@
>        <!-- parameter of type 'const unsigned char*' -->
>        <parameter type-id='type-id-22' name='dwarf_info'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2960' column='1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15' name='dwarf_info_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2961' column='1'/>
> +      <parameter type-id='type-id-8' name='dwarf_info_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2961' column='1'/>
>        <!-- parameter of type 'const unsigned char*' -->
>        <parameter type-id='type-id-22' name='dwarf_line'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2962' column='1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15' name='dwarf_line_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2963' column='1'/>
> +      <parameter type-id='type-id-8' name='dwarf_line_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2963' column='1'/>
>        <!-- parameter of type 'const unsigned char*' -->
>        <parameter type-id='type-id-22' name='dwarf_abbrev'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2964' column='1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15' name='dwarf_abbrev_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2965' column='1'/>
> +      <parameter type-id='type-id-8' name='dwarf_abbrev_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2965' column='1'/>
>        <!-- parameter of type 'const unsigned char*' -->
>        <parameter type-id='type-id-22' name='dwarf_ranges'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2966' column='1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15' name='dwarf_ranges_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2967' column='1'/>
> +      <parameter type-id='type-id-8' name='dwarf_ranges_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2967' column='1'/>
>        <!-- parameter of type 'const unsigned char*' -->
>        <parameter type-id='type-id-22' name='dwarf_str'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2968' column='1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15' name='dwarf_str_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2969' column='1'/>
> +      <parameter type-id='type-id-8' name='dwarf_str_size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2969' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='is_bigendian'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2970' column='1'/>
> +      <parameter type-id='type-id-10' name='is_bigendian'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2970' column='1'/>
>        <!-- parameter of type 'typedef backtrace_error_callback' -->
>        <parameter type-id='type-id-27' name='error_callback'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2971' column='1'/>
>        <!-- parameter of type 'void*' -->
> @@ -3178,14 +3187,14 @@
>        <!-- parameter of type 'fileline*' -->
>        <parameter type-id='type-id-23' name='fileline_fn'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c'
> line='2972' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void* __asan_backtrace_vector_grow(backtrace_state*, size_t,
> backtrace_error_callback, void*, backtrace_vector*) -->
>      <function-decl name='__asan_backtrace_vector_grow'
> mangled-name='__asan_backtrace_vector_grow'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='235' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_vector_grow'>
>        <!-- parameter of type 'backtrace_state*' -->
>        <parameter type-id='type-id-18'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'typedef backtrace_error_callback' -->
>        <parameter type-id='type-id-27'/>
>        <!-- parameter of type 'void*' -->
> @@ -3200,12 +3209,12 @@
>        <!-- parameter of type 'char*' -->
>        <parameter type-id='type-id-28'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void __asan_backtrace_free(backtrace_state*, void*, size_t,
> backtrace_error_callback, void*) -->
>      <function-decl name='__asan_backtrace_free'
> mangled-name='__asan_backtrace_free'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='212' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_free'>
> @@ -3214,7 +3223,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'typedef backtrace_error_callback' -->
>        <parameter type-id='type-id-27'/>
>        <!-- parameter of type 'void*' -->
> @@ -3227,9 +3236,9 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- void* -->
>        <return type-id='type-id-1'/>
>      </function-decl>
> @@ -3240,9 +3249,9 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'typedef __compar_fn_t' -->
>        <parameter type-id='type-id-17'/>
>        <!-- void* -->
> @@ -3253,9 +3262,9 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- typedef size_t -->
> -      <return type-id='type-id-15'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int __asan_internal_strcmp(const char*, const char*) -->
>      <function-decl name='__asan_internal_strcmp'
> filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h'
> line='43' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -3264,14 +3273,14 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void* __asan_backtrace_alloc(backtrace_state*, size_t,
> backtrace_error_callback, void*) -->
>      <function-decl name='__asan_backtrace_alloc'
> mangled-name='__asan_backtrace_alloc'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='206' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_alloc'>
>        <!-- parameter of type 'backtrace_state*' -->
>        <parameter type-id='type-id-18'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'typedef backtrace_error_callback' -->
>        <parameter type-id='type-id-27'/>
>        <!-- parameter of type 'void*' -->
> @@ -3284,9 +3293,9 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'int (void*, void*)*' -->
>        <parameter type-id='type-id-16'/>
>        <!-- void -->
> @@ -3303,7 +3312,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- char* -->
>      <pointer-type-def type-id='type-id-5' size-in-bits='64'
> id='type-id-28'/>
> @@ -3320,7 +3329,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-type>
>      <!-- void (backtrace_state*, uintptr_t, backtrace_syminfo_callback,
> backtrace_error_callback, void*) -->
>      <function-type size-in-bits='64' id='type-id-25'>
> @@ -3338,13 +3347,13 @@
>        <return type-id='type-id-4'/>
>      </function-type>
>      <!-- int -->
> -    <type-decl name='int' size-in-bits='32' id='type-id-8'/>
> +    <type-decl name='int' size-in-bits='32' id='type-id-10'/>
>      <!-- int (void*, void*)* -->
>      <pointer-type-def type-id='type-id-31' size-in-bits='64'
> id='type-id-16'/>
>      <!-- typedef void (void*, const char*, int)* backtrace_error_callback
> -->
>      <typedef-decl name='backtrace_error_callback' type-id='type-id-32'
> filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='82'
> column='1' id='type-id-27'/>
>      <!-- typedef unsigned long int size_t -->
> -    <typedef-decl name='size_t' type-id='type-id-33'
> filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h'
> line='212' column='1' id='type-id-15'/>
> +    <typedef-decl name='size_t' type-id='type-id-33'
> filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h'
> line='212' column='1' id='type-id-8'/>
>      <!-- typedef unsigned long int uintptr_t -->
>      <typedef-decl name='uintptr_t' type-id='type-id-33'
> filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-26'/>
>      <!-- unsigned char -->
> @@ -3370,11 +3379,11 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-type>
>      <!-- void (void*, uintptr_t, const char*, uintptr_t, uintptr_t) -->
>      <function-type size-in-bits='64' id='type-id-38'>
> @@ -3400,7 +3409,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int (dl_phdr_info*, typedef size_t, void*)* -->
>      <pointer-type-def type-id='type-id-40' size-in-bits='64'
> id='type-id-39'/>
> @@ -3409,11 +3418,11 @@
>        <!-- parameter of type 'dl_phdr_info*' -->
>        <parameter type-id='type-id-41'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-type>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace'
> language='LANG_C89'>
> @@ -3430,7 +3439,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='data'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c'
> line='168' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __asan_backtrace_syminfo(backtrace_state*, uintptr_t,
> backtrace_syminfo_callback, backtrace_error_callback, void*) -->
>      <function-decl name='__asan_backtrace_syminfo'
> mangled-name='__asan_backtrace_syminfo'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c'
> line='182' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_syminfo'>
> @@ -3445,7 +3454,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='data'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c'
> line='184' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __asan_backtrace_open(const char*, backtrace_error_callback,
> void*, int*) -->
>      <function-decl name='__asan_backtrace_open'
> mangled-name='__asan_backtrace_open'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='159' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_open'>
> @@ -3458,14 +3467,14 @@
>        <!-- parameter of type 'int*' -->
>        <parameter type-id='type-id-42'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __asan_backtrace_initialize(backtrace_state*, int,
> backtrace_error_callback, void*, fileline*) -->
>      <function-decl name='__asan_backtrace_initialize'
> mangled-name='__asan_backtrace_initialize'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='268' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_initialize'>
>        <!-- parameter of type 'backtrace_state*' -->
>        <parameter type-id='type-id-18'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- parameter of type 'typedef backtrace_error_callback' -->
>        <parameter type-id='type-id-27'/>
>        <!-- parameter of type 'void*' -->
> @@ -3473,10 +3482,10 @@
>        <!-- parameter of type 'fileline*' -->
>        <parameter type-id='type-id-23'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int* -->
> -    <pointer-type-def type-id='type-id-8' size-in-bits='64'
> id='type-id-42'/>
> +    <pointer-type-def type-id='type-id-10' size-in-bits='64'
> id='type-id-42'/>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace'
> language='LANG_C89'>
>      <!-- void* __asan_backtrace_vector_finish(backtrace_state*,
> backtrace_vector*, backtrace_error_callback, void*) -->
> @@ -3510,7 +3519,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- size_t backtrace_view::len -->
> -        <var-decl name='len' type-id='type-id-15' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='176' column='1'/>
> +        <var-decl name='len' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h'
> line='176' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- backtrace_view* -->
> @@ -3520,11 +3529,11 @@
>        <!-- parameter of type 'backtrace_state*' -->
>        <parameter type-id='type-id-18' name='state'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='53' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='descriptor'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='54' column='1'/>
> +      <parameter type-id='type-id-10' name='descriptor'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='54' column='1'/>
>        <!-- parameter of type 'typedef off_t' -->
>        <parameter type-id='type-id-44' name='offset'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='54' column='1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15' name='size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='54' column='1'/>
> +      <parameter type-id='type-id-8' name='size'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='54' column='1'/>
>        <!-- parameter of type 'typedef backtrace_error_callback' -->
>        <parameter type-id='type-id-27' name='error_callback'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='55' column='1'/>
>        <!-- parameter of type 'void*' -->
> @@ -3532,7 +3541,7 @@
>        <!-- parameter of type 'backtrace_view*' -->
>        <parameter type-id='type-id-47' name='view'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='56' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void __asan_backtrace_release_view(backtrace_state*,
> backtrace_view*, backtrace_error_callback, void*) -->
>      <function-decl name='__asan_backtrace_release_view'
> mangled-name='__asan_backtrace_release_view'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c'
> line='87' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_release_view'>
> @@ -3550,20 +3559,20 @@
>      <!-- int getpagesize() -->
>      <function-decl name='getpagesize' filepath='/usr/include/unistd.h'
> line='992' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void* mmap(void*, size_t, int, int, int, __off_t) -->
>      <function-decl name='mmap' filepath='/usr/include/sys/mman.h'
> line='58' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> -      <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
> +      <!-- parameter of type 'int' -->
> +      <parameter type-id='type-id-10'/>
>        <!-- parameter of type 'typedef __off_t' -->
>        <parameter type-id='type-id-43'/>
>        <!-- void* -->
> @@ -3574,9 +3583,9 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- long int -->
>      <type-decl name='long int' size-in-bits='64' id='type-id-45'/>
> @@ -3585,33 +3594,33 @@
>      <!-- int __asan_backtrace_close(int, backtrace_error_callback, void*)
> -->
>      <function-decl name='__asan_backtrace_close'
> mangled-name='__asan_backtrace_close'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c'
> line='91' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_backtrace_close'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='descriptor'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c'
> line='91' column='1'/>
> +      <parameter type-id='type-id-10' name='descriptor'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c'
> line='91' column='1'/>
>        <!-- parameter of type 'typedef backtrace_error_callback' -->
>        <parameter type-id='type-id-27' name='error_callback'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c'
> line='91' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='data'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c'
> line='92' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int open(const char*, int, ...) -->
>      <function-decl name='open' filepath='/usr/include/fcntl.h' line='131'
> column='1' visibility='default' binding='global' size-in-bits='64'>
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int fcntl(int, int, ...) -->
>      <function-decl name='fcntl' filepath='/usr/include/fcntl.h'
> line='122' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int* __errno_location() -->
>      <function-decl name='__errno_location'
> filepath='/usr/include/bits/errno.h' line='47' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -3621,9 +3630,9 @@
>      <!-- int close(int) -->
>      <function-decl name='close' filepath='/usr/include/unistd.h'
> line='350' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace'
> language='LANG_C89'>
> @@ -3632,7 +3641,7 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2' name='filename'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c'
> line='46' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='threaded'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c'
> line='46' column='1'/>
> +      <parameter type-id='type-id-10' name='threaded'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c'
> line='46' column='1'/>
>        <!-- parameter of type 'typedef backtrace_error_callback' -->
>        <parameter type-id='type-id-27' name='error_callback'
> filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c'
> line='47' column='1'/>
>        <!-- parameter of type 'void*' -->
> @@ -3812,7 +3821,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int len -->
> -        <var-decl name='len' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='466'
> column='1'/>
> +        <var-decl name='len' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='466'
> column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- struct {const demangle_operator_info* op;} -->
> @@ -3834,18 +3843,18 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- int demangle_operator_info::len -->
> -        <var-decl name='len' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='44' column='1'/>
> +        <var-decl name='len' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='44' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='160'>
>          <!-- int demangle_operator_info::args -->
> -        <var-decl name='args' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='46' column='1'/>
> +        <var-decl name='args' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='46' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- struct {int args; demangle_component* name;} -->
>      <class-decl name='__anonymous_struct__2' size-in-bits='128'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='477'
> column='1' id='type-id-65'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- int args -->
> -        <var-decl name='args' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='480'
> column='1'/>
> +        <var-decl name='args' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='480'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- demangle_component* name -->
> @@ -3922,7 +3931,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int demangle_builtin_type_info::len -->
> -        <var-decl name='len' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='82' column='1'/>
> +        <var-decl name='len' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='82' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- const char* demangle_builtin_type_info::java_name -->
> @@ -3930,7 +3939,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <!-- int demangle_builtin_type_info::java_len -->
> -        <var-decl name='java_len' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='86' column='1'/>
> +        <var-decl name='java_len' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='86' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='224'>
>          <!-- d_builtin_type_print demangle_builtin_type_info::print -->
> @@ -3959,7 +3968,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int len -->
> -        <var-decl name='len' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='527'
> column='1'/>
> +        <var-decl name='len' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='527'
> column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- struct {long int number;} -->
> @@ -3973,7 +3982,7 @@
>      <class-decl name='__anonymous_struct__9' size-in-bits='32'
> is-struct='yes' is-anonymous='yes' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='538'
> column='1' id='type-id-72'>
>        <data-member access='public' layout-offset-in-bits='0'>
>          <!-- int character -->
> -        <var-decl name='character' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='540'
> column='1'/>
> +        <var-decl name='character' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='540'
> column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- struct {demangle_component* left; demangle_component* right;} -->
> @@ -3995,7 +4004,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int num -->
> -        <var-decl name='num' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='557'
> column='1'/>
> +        <var-decl name='num' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/../include/demangle.h' line='557'
> column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- struct d_info -->
> @@ -4010,7 +4019,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- int d_info::options -->
> -        <var-decl name='options' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='100' column='1'/>
> +        <var-decl name='options' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='100' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='192'>
>          <!-- const char* d_info::n -->
> @@ -4022,11 +4031,11 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='320'>
>          <!-- int d_info::next_comp -->
> -        <var-decl name='next_comp' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='106' column='1'/>
> +        <var-decl name='next_comp' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='106' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='352'>
>          <!-- int d_info::num_comps -->
> -        <var-decl name='num_comps' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='108' column='1'/>
> +        <var-decl name='num_comps' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='108' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='384'>
>          <!-- demangle_component** d_info::subs -->
> @@ -4034,15 +4043,15 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='448'>
>          <!-- int d_info::next_sub -->
> -        <var-decl name='next_sub' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='112' column='1'/>
> +        <var-decl name='next_sub' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='112' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='480'>
>          <!-- int d_info::num_subs -->
> -        <var-decl name='num_subs' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='114' column='1'/>
> +        <var-decl name='num_subs' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='114' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='512'>
>          <!-- int d_info::did_subs -->
> -        <var-decl name='did_subs' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='118' column='1'/>
> +        <var-decl name='did_subs' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='118' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='576'>
>          <!-- demangle_component* d_info::last_name -->
> @@ -4050,15 +4059,15 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='640'>
>          <!-- int d_info::expansion -->
> -        <var-decl name='expansion' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='124' column='1'/>
> +        <var-decl name='expansion' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='124' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='672'>
>          <!-- int d_info::is_expression -->
> -        <var-decl name='is_expression' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='126' column='1'/>
> +        <var-decl name='is_expression' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='126' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='704'>
>          <!-- int d_info::is_conversion -->
> -        <var-decl name='is_conversion' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='129' column='1'/>
> +        <var-decl name='is_conversion' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h'
> line='129' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- const demangle_builtin_type_info -->
> @@ -4086,20 +4095,20 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2' name='s'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='783' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='len'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='783' column='1'/>
> +      <parameter type-id='type-id-10' name='len'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='783' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int
> __asan_cplus_demangle_fill_extended_operator(demangle_component*, int,
> demangle_component*) -->
>      <function-decl name='__asan_cplus_demangle_fill_extended_operator'
> mangled-name='__asan_cplus_demangle_fill_extended_operator'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='797' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='__asan_cplus_demangle_fill_extended_operator'>
>        <!-- parameter of type 'demangle_component*' -->
>        <parameter type-id='type-id-76' name='p'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='797' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='args'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='797' column='1'/>
> +      <parameter type-id='type-id-10' name='args'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='797' column='1'/>
>        <!-- parameter of type 'demangle_component*' -->
>        <parameter type-id='type-id-76' name='name'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='798' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __asan_cplus_demangle_fill_ctor(demangle_component*,
> gnu_v3_ctor_kinds, demangle_component*) -->
>      <function-decl name='__asan_cplus_demangle_fill_ctor'
> mangled-name='__asan_cplus_demangle_fill_ctor'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='812' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_fill_ctor'>
> @@ -4110,7 +4119,7 @@
>        <!-- parameter of type 'demangle_component*' -->
>        <parameter type-id='type-id-76' name='name'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='814' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __asan_cplus_demangle_fill_dtor(demangle_component*,
> gnu_v3_dtor_kinds, demangle_component*) -->
>      <function-decl name='__asan_cplus_demangle_fill_dtor'
> mangled-name='__asan_cplus_demangle_fill_dtor'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='831' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_fill_dtor'>
> @@ -4121,7 +4130,7 @@
>        <!-- parameter of type 'demangle_component*' -->
>        <parameter type-id='type-id-76' name='name'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='833' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- demangle_component* __asan_cplus_demangle_type(d_info*) -->
>      <function-decl name='__asan_cplus_demangle_type'
> mangled-name='__asan_cplus_demangle_type'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='2230' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_type'>
> @@ -4135,14 +4144,14 @@
>        <!-- parameter of type 'd_info*' -->
>        <parameter type-id='type-id-86' name='di'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='1140' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='top_level'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='1140' column='1'/>
> +      <parameter type-id='type-id-10' name='top_level'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='1140' column='1'/>
>        <!-- demangle_component* -->
>        <return type-id='type-id-76'/>
>      </function-decl>
>      <!-- int __asan_cplus_demangle_print_callback(int, const
> demangle_component*, demangle_callbackref, void*) -->
>      <function-decl name='__asan_cplus_demangle_print_callback'
> mangled-name='__asan_cplus_demangle_print_callback'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4029' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_print_callback'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4029' column='1'/>
> +      <parameter type-id='type-id-10' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4029' column='1'/>
>        <!-- parameter of type 'const demangle_component*' -->
>        <parameter type-id='type-id-85' name='dc'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4030' column='1'/>
>        <!-- parameter of type 'typedef demangle_callbackref' -->
> @@ -4150,16 +4159,16 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='opaque'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4031' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- char* __asan_cplus_demangle_print(int, const
> demangle_component*, int, size_t*) -->
>      <function-decl name='__asan_cplus_demangle_print'
> mangled-name='__asan_cplus_demangle_print'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4069' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_print'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4069' column='1'/>
> +      <parameter type-id='type-id-10' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4069' column='1'/>
>        <!-- parameter of type 'const demangle_component*' -->
>        <parameter type-id='type-id-85' name='dc'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4069' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='estimate'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4070' column='1'/>
> +      <parameter type-id='type-id-10' name='estimate'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4070' column='1'/>
>        <!-- parameter of type 'size_t*' -->
>        <parameter type-id='type-id-88' name='palc'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='4070' column='1'/>
>        <!-- char* -->
> @@ -4170,9 +4179,9 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2' name='mangled'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='5731' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='5731' column='1'/>
> +      <parameter type-id='type-id-10' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='5731' column='1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15' name='len'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='5731' column='1'/>
> +      <parameter type-id='type-id-8' name='len'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='5731' column='1'/>
>        <!-- parameter of type 'd_info*' -->
>        <parameter type-id='type-id-86' name='di'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='5732' column='1'/>
>        <!-- void -->
> @@ -4183,7 +4192,7 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2' name='mangled'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6018' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6018' column='1'/>
> +      <parameter type-id='type-id-10' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6018' column='1'/>
>        <!-- char* -->
>        <return type-id='type-id-28'/>
>      </function-decl>
> @@ -4192,13 +4201,13 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2' name='mangled'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6026' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6026' column='1'/>
> +      <parameter type-id='type-id-10' name='options'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6026' column='1'/>
>        <!-- parameter of type 'typedef demangle_callbackref' -->
>        <parameter type-id='type-id-87' name='callback'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6027' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='opaque'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6027' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- char* __asan_java_demangle_v3(const char*) -->
>      <function-decl name='__asan_java_demangle_v3'
> mangled-name='__asan_java_demangle_v3'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6039' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_java_demangle_v3'>
> @@ -4216,7 +4225,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='opaque'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6048' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- gnu_v3_ctor_kinds __asan_is_gnu_v3_mangled_ctor(const char*) -->
>      <function-decl name='__asan_is_gnu_v3_mangled_ctor'
> mangled-name='__asan_is_gnu_v3_mangled_ctor'
> filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c'
> line='6137' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__asan_is_gnu_v3_mangled_ctor'>
> @@ -4248,7 +4257,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- void* -->
>        <return type-id='type-id-1'/>
>      </function-decl>
> @@ -4259,7 +4268,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- void* -->
>        <return type-id='type-id-1'/>
>      </function-decl>
> @@ -4268,7 +4277,7 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- typedef size_t -->
> -      <return type-id='type-id-15'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int sprintf(char*, const char*, ...) -->
>      <function-decl name='sprintf' filepath='/usr/include/stdio.h'
> line='363' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -4278,7 +4287,7 @@
>        <parameter type-id='type-id-2'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __asan_internal_strncmp(const char*, const char*, size_t) -->
>      <function-decl name='__asan_internal_strncmp'
> filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h'
> line='44' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -4287,9 +4296,9 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __asan_internal_memcmp(void*, void*, size_t) -->
>      <function-decl name='__asan_internal_memcmp'
> filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h'
> line='42' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -4298,14 +4307,14 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- short int -->
>      <type-decl name='short int' size-in-bits='16' id='type-id-77'/>
>      <!-- size_t* -->
> -    <pointer-type-def type-id='type-id-15' size-in-bits='64'
> id='type-id-88'/>
> +    <pointer-type-def type-id='type-id-8' size-in-bits='64'
> id='type-id-88'/>
>      <!-- sizetype -->
>      <type-decl name='sizetype' size-in-bits='64' id='type-id-50'/>
>      <!-- typedef void (const char*, typedef size_t, void*)*
> demangle_callbackref -->
> @@ -4317,7 +4326,7 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- void -->
> @@ -4818,9 +4827,9 @@
>          <!-- parameter of type 'const char*' -->
>          <parameter type-id='type-id-2'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -4937,7 +4946,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::InternalScopedBuffer<char>*' -->
>              <parameter type-id='type-id-133' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -5015,13 +5024,13 @@
>        <!-- parameter of type 'char*' -->
>        <parameter type-id='type-id-28'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- bool -->
>        <return type-id='type-id-124'/>
>      </function-type>
>      <namespace-decl name='__sanitizer'>
>        <!-- typedef int __sanitizer::fd_t -->
> -      <typedef-decl name='fd_t' type-id='type-id-8'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h'
> line='74' column='1' id='type-id-132'/>
> +      <typedef-decl name='fd_t' type-id='type-id-10'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h'
> line='74' column='1' id='type-id-132'/>
>      </namespace-decl>
>      <!-- unsigned long int& -->
>      <reference-type-def kind='lvalue' type-id='type-id-33'
> size-in-bits='64' id='type-id-129'/>
> @@ -5061,7 +5070,7 @@
>          <!-- parameter of type 'typedef __sanitizer::fd_t' -->
>          <parameter type-id='type-id-132'/>
>          <!-- int -->
> -        <return type-id='type-id-8'/>
> +        <return type-id='type-id-10'/>
>        </function-decl>
>      </namespace-decl>
>    </abi-instr>
> @@ -5125,7 +5134,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::InternalMmapVector<long unsigned int>*' -->
>              <parameter type-id='type-id-140' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -5282,7 +5291,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::InternalMmapVector<unsigned int>*' -->
>              <parameter type-id='type-id-142' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -5462,7 +5471,7 @@
>        <!-- bool __sanitizer::IsSpace(int) -->
>        <function-decl name='IsSpace'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h'
> line='299' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- bool -->
>          <return type-id='type-id-124'/>
>        </function-decl>
> @@ -5475,7 +5484,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99' name='n'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633'
> column='1'/>
>          <!-- int -->
> -        <return type-id='type-id-8'/>
> +        <return type-id='type-id-10'/>
>        </function-decl>
>        <!-- __sanitizer::uptr __sanitizer::RoundDownTo(__sanitizer::uptr,
> __sanitizer::uptr) -->
>        <function-decl name='RoundDownTo'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h'
> line='265' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -5489,7 +5498,7 @@
>        <!-- bool __sanitizer::IsDigit(int) -->
>        <function-decl name='IsDigit'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h'
> line='303' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- bool -->
>          <return type-id='type-id-124'/>
>        </function-decl>
> @@ -5507,7 +5516,7 @@
>          <!-- parameter of type 'void*' -->
>          <parameter type-id='type-id-1'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- void* -->
> @@ -5538,7 +5547,7 @@
>          <!-- parameter of type 'const char*' -->
>          <parameter type-id='type-id-2'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- char* -->
>          <return type-id='type-id-28'/>
>        </function-decl>
> @@ -5560,7 +5569,7 @@
>          <!-- parameter of type 'char**' -->
>          <parameter type-id='type-id-130'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- typedef __sanitizer::s64 -->
>          <return type-id='type-id-157'/>
>        </function-decl>
> @@ -5599,11 +5608,11 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int sigaltstack::ss_flags -->
> -        <var-decl name='ss_flags' type-id='type-id-8'
> visibility='default' filepath='/usr/include/bits/sigstack.h' line='53'
> column='1'/>
> +        <var-decl name='ss_flags' type-id='type-id-10'
> visibility='default' filepath='/usr/include/bits/sigstack.h' line='53'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- size_t sigaltstack::ss_size -->
> -        <var-decl name='ss_size' type-id='type-id-15'
> visibility='default' filepath='/usr/include/bits/sigstack.h' line='54'
> column='1'/>
> +        <var-decl name='ss_size' type-id='type-id-8' visibility='default'
> filepath='/usr/include/bits/sigstack.h' line='54' column='1'/>
>        </data-member>
>      </class-decl>
>      <!-- struct link_map -->
> @@ -5849,7 +5858,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::MemoryMappingLayout*' -->
>              <parameter type-id='type-id-172' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -5888,7 +5897,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::MemoryMappingLayout*' -->
>              <parameter type-id='type-id-172' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -5924,11 +5933,11 @@
>        <class-decl name='ThreadLister' size-in-bits='384'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h'
> line='46' column='1' id='type-id-173'>
>          <data-member access='private' layout-offset-in-bits='0'>
>            <!-- int __sanitizer::ThreadLister::pid_ -->
> -          <var-decl name='pid_' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h'
> line='59' column='1'/>
> +          <var-decl name='pid_' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h'
> line='59' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='32'>
>            <!-- int __sanitizer::ThreadLister::descriptor_ -->
> -          <var-decl name='descriptor_' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h'
> line='60' column='1'/>
> +          <var-decl name='descriptor_' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h'
> line='60' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='64'>
>            <!-- __sanitizer::InternalScopedBuffer<char>
> __sanitizer::ThreadLister::buffer_ -->
> @@ -5944,7 +5953,7 @@
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='320'>
>            <!-- int __sanitizer::ThreadLister::bytes_read_ -->
> -          <var-decl name='bytes_read_' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h'
> line='64' column='1'/>
> +          <var-decl name='bytes_read_' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h'
> line='64' column='1'/>
>          </data-member>
>          <member-function access='public' constructor='yes'>
>            <!-- __sanitizer::ThreadLister::ThreadLister(int) -->
> @@ -5952,7 +5961,7 @@
>              <!-- implicit parameter of type '__sanitizer::ThreadLister*'
> -->
>              <parameter type-id='type-id-174' is-artificial='yes'/>
>              <!-- parameter of type 'int' -->
> -            <parameter type-id='type-id-8'/>
> +            <parameter type-id='type-id-10'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -5963,7 +5972,7 @@
>              <!-- implicit parameter of type '__sanitizer::ThreadLister*'
> -->
>              <parameter type-id='type-id-174' is-artificial='yes'/>
>              <!-- parameter of type 'int' -->
> -            <parameter type-id='type-id-8'/>
> +            <parameter type-id='type-id-10'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -5974,7 +5983,7 @@
>              <!-- implicit parameter of type '__sanitizer::ThreadLister*'
> -->
>              <parameter type-id='type-id-174' is-artificial='yes'/>
>              <!-- int -->
> -            <return type-id='type-id-8'/>
> +            <return type-id='type-id-10'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public'>
> @@ -6010,7 +6019,7 @@
>              <!-- implicit parameter of type '__sanitizer::ThreadLister*'
> -->
>              <parameter type-id='type-id-174' is-artificial='yes'/>
>              <!-- parameter of type 'int' -->
> -            <parameter type-id='type-id-8'/>
> +            <parameter type-id='type-id-10'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -6021,7 +6030,7 @@
>              <!-- implicit parameter of type '__sanitizer::ThreadLister*'
> -->
>              <parameter type-id='type-id-174' is-artificial='yes'/>
>              <!-- parameter of type 'int' -->
> -            <parameter type-id='type-id-8'/>
> +            <parameter type-id='type-id-10'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -6032,7 +6041,7 @@
>          <!-- parameter of type 'const char*' -->
>          <parameter type-id='type-id-2'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'typedef __sanitizer::u32' -->
>          <parameter type-id='type-id-196'/>
>          <!-- typedef __sanitizer::uptr -->
> @@ -6074,7 +6083,7 @@
>          <!-- parameter of type 'typedef __sanitizer::OFF_T' -->
>          <parameter type-id='type-id-197'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- typedef __sanitizer::uptr -->
>          <return type-id='type-id-99'/>
>        </function-decl>
> @@ -6094,7 +6103,7 @@
>          <!-- parameter of type 'const char*' -->
>          <parameter type-id='type-id-2'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- typedef __sanitizer::uptr -->
>          <return type-id='type-id-99'/>
>        </function-decl>
> @@ -6116,11 +6125,11 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'typedef __sanitizer::u64' -->
>          <parameter type-id='type-id-198'/>
>          <!-- typedef __sanitizer::uptr -->
> @@ -6184,9 +6193,9 @@
>        <!-- __sanitizer::uptr __sanitizer::internal_ptrace(int, int,
> void*, void*) -->
>        <function-decl name='internal_ptrace'
> mangled-name='_ZN11__sanitizer15internal_ptraceEiiPvS0_'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc'
> line='573' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8' name='request'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='1524' column='1'/>
> +        <parameter type-id='type-id-10' name='request'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='1524' column='1'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8' name='pid'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='1524' column='1'/>
> +        <parameter type-id='type-id-10' name='pid'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='1524' column='1'/>
>          <!-- parameter of type 'void*' -->
>          <parameter type-id='type-id-1' name='addr'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='1524' column='1'/>
>          <!-- parameter of type 'void*' -->
> @@ -6197,11 +6206,11 @@
>        <!-- __sanitizer::uptr __sanitizer::internal_waitpid(int, int*,
> int) -->
>        <function-decl name='internal_waitpid'
> mangled-name='_ZN11__sanitizer16internal_waitpidEiPii'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc'
> line='577' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'int*' -->
>          <parameter type-id='type-id-42'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- typedef __sanitizer::uptr -->
>          <return type-id='type-id-99'/>
>        </function-decl>
> @@ -6213,7 +6222,7 @@
>        <!-- __sanitizer::uptr __sanitizer::internal_prctl(int,
> __sanitizer::uptr, __sanitizer::uptr, __sanitizer::uptr, __sanitizer::uptr)
> -->
>        <function-decl name='internal_prctl'
> mangled-name='_ZN11__sanitizer14internal_prctlEimmmm'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc'
> line='598' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
> @@ -6237,7 +6246,7 @@
>        <!-- __sanitizer::uptr __sanitizer::internal_sigaction(int, const
> __sanitizer::__sanitizer_kernel_sigaction_t*,
> __sanitizer::__sanitizer_kernel_sigaction_t*) -->
>        <function-decl name='internal_sigaction'
> mangled-name='_ZN11__sanitizer18internal_sigactionEiPKNS_30__sanitizer_kernel_sigaction_tEPS0_'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc'
> line='607' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'const
> __sanitizer::__sanitizer_kernel_sigaction_t*' -->
>          <parameter type-id='type-id-182'/>
>          <!-- parameter of type
> '__sanitizer::__sanitizer_kernel_sigaction_t*' -->
> @@ -6250,7 +6259,7 @@
>          <!-- parameter of type
> '__sanitizer::__sanitizer_kernel_sigset_t*' -->
>          <parameter type-id='type-id-202'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -6293,7 +6302,7 @@
>          <!-- parameter of type 'void*' -->
>          <parameter type-id='type-id-1'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'void*' -->
>          <parameter type-id='type-id-1'/>
>          <!-- parameter of type 'int*' -->
> @@ -6386,7 +6395,7 @@
>      <!-- void (int, void*, void*) -->
>      <function-type size-in-bits='64' id='type-id-186'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'void*' -->
> @@ -6537,7 +6546,7 @@
>      <!-- pthread_attr_t* -->
>      <pointer-type-def type-id='type-id-223' size-in-bits='64'
> id='type-id-230'/>
>      <!-- size_t* -->
> -    <pointer-type-def type-id='type-id-15' size-in-bits='64'
> id='type-id-88'/>
> +    <pointer-type-def type-id='type-id-8' size-in-bits='64'
> id='type-id-88'/>
>      <!-- namespace __sanitizer -->
>      <namespace-decl name='__sanitizer'>
>        <!-- typedef bool (const char*)* __sanitizer::string_predicate_t -->
> @@ -6600,7 +6609,7 @@
>          <!-- parameter of type 'char*' -->
>          <parameter type-id='type-id-28'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- bool -->
>          <return type-id='type-id-124'/>
>        </function-decl>
> @@ -6647,7 +6656,7 @@
>        <!-- parameter of type 'size_t*' -->
>        <parameter type-id='type-id-88'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void* dlsym(void*, const char*) -->
>      <function-decl name='dlsym' filepath='/usr/include/dlfcn.h' line='65'
> column='1' visibility='default' binding='global' size-in-bits='64'>
> @@ -6661,30 +6670,30 @@
>      <!-- int prctl(int, ...) -->
>      <function-decl name='prctl' filepath='/usr/include/sys/prctl.h'
> line='28' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <parameter is-variadic='yes'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- size_t confstr(int, char*, size_t) -->
>      <function-decl name='confstr' filepath='/usr/include/unistd.h'
> line='620' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- parameter of type 'char*' -->
>        <parameter type-id='type-id-28'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- typedef size_t -->
> -      <return type-id='type-id-15'/>
> +      <return type-id='type-id-8'/>
>      </function-decl>
>      <!-- int pthread_attr_setstacksize(pthread_attr_t*, size_t) -->
>      <function-decl name='pthread_attr_setstacksize'
> filepath='/usr/include/pthread.h' line='367' column='1'
> visibility='default' binding='global' size-in-bits='64'>
>        <!-- parameter of type 'pthread_attr_t*' -->
>        <parameter type-id='type-id-230'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> +      <parameter type-id='type-id-8'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- bool (const char*) -->
>      <function-type size-in-bits='64' id='type-id-226'>
> @@ -6791,15 +6800,15 @@
>        <!-- __sanitizer::uptr __sanitizer::sa_siginfo -->
>        <var-decl name='sa_siginfo' type-id='type-id-99'
> mangled-name='_ZN11__sanitizer10sa_siginfoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='180' column='1'/>
>        <!-- int __sanitizer::e_tabsz -->
> -      <var-decl name='e_tabsz' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer7e_tabszE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='183' column='1'/>
> +      <var-decl name='e_tabsz' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer7e_tabszE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='183' column='1'/>
>        <!-- int __sanitizer::af_inet -->
> -      <var-decl name='af_inet' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer7af_inetE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='196' column='1'/>
> +      <var-decl name='af_inet' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer7af_inetE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='196' column='1'/>
>        <!-- int __sanitizer::af_inet6 -->
> -      <var-decl name='af_inet6' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer8af_inet6E' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='197' column='1'/>
> +      <var-decl name='af_inet6' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer8af_inet6E' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='197' column='1'/>
>        <!-- int __sanitizer::glob_nomatch -->
> -      <var-decl name='glob_nomatch' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer12glob_nomatchE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='209' column='1'/>
> +      <var-decl name='glob_nomatch' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer12glob_nomatchE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='209' column='1'/>
>        <!-- int __sanitizer::glob_altdirfunc -->
> -      <var-decl name='glob_altdirfunc' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer15glob_altdirfuncE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='210' column='1'/>
> +      <var-decl name='glob_altdirfunc' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer15glob_altdirfuncE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='210' column='1'/>
>        <!-- unsigned int __sanitizer::path_max -->
>        <var-decl name='path_max' type-id='type-id-149'
> mangled-name='_ZN11__sanitizer8path_maxE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='243' column='1'/>
>        <!-- unsigned int __sanitizer::struct_user_regs_struct_sz -->
> @@ -6809,43 +6818,43 @@
>        <!-- unsigned int __sanitizer::struct_user_fpxregs_struct_sz -->
>        <var-decl name='struct_user_fpxregs_struct_sz'
> type-id='type-id-149'
> mangled-name='_ZN11__sanitizer29struct_user_fpxregs_struct_szE'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='218' column='1'/>
>        <!-- int __sanitizer::ptrace_peektext -->
> -      <var-decl name='ptrace_peektext' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer15ptrace_peektextE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='223' column='1'/>
> +      <var-decl name='ptrace_peektext' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer15ptrace_peektextE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='223' column='1'/>
>        <!-- int __sanitizer::ptrace_peekdata -->
> -      <var-decl name='ptrace_peekdata' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer15ptrace_peekdataE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='224' column='1'/>
> +      <var-decl name='ptrace_peekdata' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer15ptrace_peekdataE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='224' column='1'/>
>        <!-- int __sanitizer::ptrace_peekuser -->
> -      <var-decl name='ptrace_peekuser' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer15ptrace_peekuserE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='225' column='1'/>
> +      <var-decl name='ptrace_peekuser' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer15ptrace_peekuserE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='225' column='1'/>
>        <!-- int __sanitizer::ptrace_getregs -->
> -      <var-decl name='ptrace_getregs' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer14ptrace_getregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='226' column='1'/>
> +      <var-decl name='ptrace_getregs' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer14ptrace_getregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='226' column='1'/>
>        <!-- int __sanitizer::ptrace_setregs -->
> -      <var-decl name='ptrace_setregs' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer14ptrace_setregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='227' column='1'/>
> +      <var-decl name='ptrace_setregs' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer14ptrace_setregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='227' column='1'/>
>        <!-- int __sanitizer::ptrace_getfpregs -->
> -      <var-decl name='ptrace_getfpregs' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer16ptrace_getfpregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='228' column='1'/>
> +      <var-decl name='ptrace_getfpregs' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer16ptrace_getfpregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='228' column='1'/>
>        <!-- int __sanitizer::ptrace_setfpregs -->
> -      <var-decl name='ptrace_setfpregs' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer16ptrace_setfpregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='229' column='1'/>
> +      <var-decl name='ptrace_setfpregs' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer16ptrace_setfpregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='229' column='1'/>
>        <!-- int __sanitizer::ptrace_getfpxregs -->
> -      <var-decl name='ptrace_getfpxregs' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer17ptrace_getfpxregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='230' column='1'/>
> +      <var-decl name='ptrace_getfpxregs' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer17ptrace_getfpxregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='230' column='1'/>
>        <!-- int __sanitizer::ptrace_setfpxregs -->
> -      <var-decl name='ptrace_setfpxregs' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer17ptrace_setfpxregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='231' column='1'/>
> +      <var-decl name='ptrace_setfpxregs' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer17ptrace_setfpxregsE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='231' column='1'/>
>        <!-- int __sanitizer::ptrace_getsiginfo -->
> -      <var-decl name='ptrace_getsiginfo' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer17ptrace_getsiginfoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='232' column='1'/>
> +      <var-decl name='ptrace_getsiginfo' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer17ptrace_getsiginfoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='232' column='1'/>
>        <!-- int __sanitizer::ptrace_setsiginfo -->
> -      <var-decl name='ptrace_setsiginfo' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer17ptrace_setsiginfoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='233' column='1'/>
> +      <var-decl name='ptrace_setsiginfo' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer17ptrace_setsiginfoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='233' column='1'/>
>        <!-- int __sanitizer::ptrace_getregset -->
> -      <var-decl name='ptrace_getregset' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer16ptrace_getregsetE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='238' column='1'/>
> +      <var-decl name='ptrace_getregset' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer16ptrace_getregsetE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='238' column='1'/>
>        <!-- int __sanitizer::ptrace_setregset -->
> -      <var-decl name='ptrace_setregset' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer16ptrace_setregsetE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='239' column='1'/>
> +      <var-decl name='ptrace_setregset' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer16ptrace_setregsetE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='239' column='1'/>
>        <!-- unsigned int __sanitizer::struct_shminfo_sz -->
>        <var-decl name='struct_shminfo_sz' type-id='type-id-149'
> mangled-name='_ZN11__sanitizer17struct_shminfo_szE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='188' column='1'/>
>        <!-- unsigned int __sanitizer::struct_shm_info_sz -->
>        <var-decl name='struct_shm_info_sz' type-id='type-id-149'
> mangled-name='_ZN11__sanitizer18struct_shm_info_szE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='189' column='1'/>
>        <!-- int __sanitizer::shmctl_ipc_stat -->
> -      <var-decl name='shmctl_ipc_stat' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer15shmctl_ipc_statE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='190' column='1'/>
> +      <var-decl name='shmctl_ipc_stat' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer15shmctl_ipc_statE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='190' column='1'/>
>        <!-- int __sanitizer::shmctl_ipc_info -->
> -      <var-decl name='shmctl_ipc_info' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer15shmctl_ipc_infoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='191' column='1'/>
> +      <var-decl name='shmctl_ipc_info' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer15shmctl_ipc_infoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='191' column='1'/>
>        <!-- int __sanitizer::shmctl_shm_info -->
> -      <var-decl name='shmctl_shm_info' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer15shmctl_shm_infoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='192' column='1'/>
> +      <var-decl name='shmctl_shm_info' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer15shmctl_shm_infoE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='192' column='1'/>
>        <!-- int __sanitizer::shmctl_shm_stat -->
> -      <var-decl name='shmctl_shm_stat' type-id='type-id-8'
> mangled-name='_ZN11__sanitizer15shmctl_shm_statE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='193' column='1'/>
> +      <var-decl name='shmctl_shm_stat' type-id='type-id-10'
> mangled-name='_ZN11__sanitizer15shmctl_shm_statE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='193' column='1'/>
>        <!-- unsigned int __sanitizer::struct_arpreq_sz -->
>        <var-decl name='struct_arpreq_sz' type-id='type-id-149'
> mangled-name='_ZN11__sanitizer16struct_arpreq_szE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='246' column='1'/>
>        <!-- unsigned int __sanitizer::struct_ifreq_sz -->
> @@ -7782,7 +7791,7 @@
>        <var-decl name='sigset_t_sz' type-id='type-id-149'
> mangled-name='_ZN11__sanitizer11sigset_t_szE' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc'
> line='138' column='1'/>
>      </namespace-decl>
>      <!-- const int -->
> -    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-233'/>
> +    <qualified-type-def type-id='type-id-10' const='yes'
> id='type-id-233'/>
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='../../.././libsanitizer/sanitizer_common/sanitizer_posix.cc'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common'
> language='LANG_C_plus_plus'>
>      <!-- namespace __sanitizer -->
> @@ -7890,7 +7899,7 @@
>          <!-- parameter of type 'void ()*' -->
>          <parameter type-id='type-id-125' name='f'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342'
> column='1'/>
>          <!-- int -->
> -        <return type-id='type-id-8'/>
> +        <return type-id='type-id-10'/>
>        </function-decl>
>      </namespace-decl>
>      <!-- __uid_t getuid() -->
> @@ -7908,11 +7917,11 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1'/>
>        <!-- parameter of type 'typedef size_t' -->
> -      <parameter type-id='type-id-15'/>
> -      <!-- parameter of type 'int' -->
>        <parameter type-id='type-id-8'/>
> +      <!-- parameter of type 'int' -->
> +      <parameter type-id='type-id-10'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int setrlimit(__rlimit_resource_t, const rlimit*) -->
>      <function-decl name='setrlimit'
> filepath='/usr/include/sys/resource.h' line='70' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -7921,7 +7930,7 @@
>        <!-- parameter of type 'const rlimit*' -->
>        <parameter type-id='type-id-239'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- unsigned int sleep(unsigned int) -->
>      <function-decl name='sleep' filepath='/usr/include/unistd.h'
> line='441' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -7935,7 +7944,7 @@
>        <!-- parameter of type 'typedef __useconds_t' -->
>        <parameter type-id='type-id-236'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void abort() -->
>      <function-decl name='abort' filepath='/usr/include/stdlib.h'
> line='514' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -7947,14 +7956,14 @@
>        <!-- parameter of type 'void ()*' -->
>        <parameter type-id='type-id-125' name='f'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int isatty(int) -->
>      <function-decl name='isatty' filepath='/usr/include/unistd.h'
> line='798' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- struct rlimit -->
>      <class-decl name='rlimit' size-in-bits='128' is-struct='yes'
> visibility='default' filepath='/usr/include/bits/resource.h' line='135'
> column='1' id='type-id-237'>
> @@ -7968,7 +7977,7 @@
>        </data-member>
>      </class-decl>
>      <!-- typedef int __rlimit_resource_t -->
> -    <typedef-decl name='__rlimit_resource_t' type-id='type-id-8'
> filepath='/usr/include/sys/resource.h' line='43' column='1'
> id='type-id-240'/>
> +    <typedef-decl name='__rlimit_resource_t' type-id='type-id-10'
> filepath='/usr/include/sys/resource.h' line='43' column='1'
> id='type-id-240'/>
>      <!-- typedef __rlim_t rlim_t -->
>      <typedef-decl name='rlim_t' type-id='type-id-242'
> filepath='/usr/include/bits/resource.h' line='127' column='1'
> id='type-id-241'/>
>      <!-- typedef unsigned long int __rlim_t -->
> @@ -7984,13 +7993,13 @@
>          <!-- parameter of type 'char*' -->
>          <parameter type-id='type-id-28'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'const char*' -->
>          <parameter type-id='type-id-2'/>
>          <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
>          <parameter type-id='type-id-245'/>
>          <!-- int -->
> -        <return type-id='type-id-8'/>
> +        <return type-id='type-id-10'/>
>        </function-decl>
>        <!-- void __sanitizer::SetPrintfAndReportCallback(void (const
> char*)*) -->
>        <function-decl name='SetPrintfAndReportCallback'
> mangled-name='_ZN11__sanitizer26SetPrintfAndReportCallbackEPFvPKcE'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc'
> line='192' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -8214,7 +8223,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>*'
> -->
>              <parameter type-id='type-id-250' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -8486,7 +8495,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::ScopedStackSpaceWithGuard*' -->
>              <parameter type-id='type-id-275' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -8520,7 +8529,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::ScopedSetTracerPID*' -->
>              <parameter type-id='type-id-273' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -8599,7 +8608,7 @@
>        <class-decl name='StopTheWorldScope' size-in-bits='32'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc'
> line='307' column='1' id='type-id-276'>
>          <data-member access='private' layout-offset-in-bits='0'>
>            <!-- int __sanitizer::StopTheWorldScope::process_was_dumpable_
> -->
> -          <var-decl name='process_was_dumpable_' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc'
> line='354' column='1'/>
> +          <var-decl name='process_was_dumpable_' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc'
> line='354' column='1'/>
>          </data-member>
>          <member-function access='public' constructor='yes'>
>            <!-- __sanitizer::StopTheWorldScope::StopTheWorldScope() -->
> @@ -8616,7 +8625,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::StopTheWorldScope*' -->
>              <parameter type-id='type-id-277' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -8625,7 +8634,7 @@
>        <!-- void __sanitizer::TracerThreadSignalHandler(int, void*, void*)
> -->
>        <function-decl name='TracerThreadSignalHandler'
> mangled-name='_ZN11__sanitizer25TracerThreadSignalHandlerEiPvS0_'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc'
> line='193' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'void*' -->
>          <parameter type-id='type-id-1'/>
>          <!-- parameter of type 'void*' -->
> @@ -8753,7 +8762,7 @@
>              <!-- parameter of type '__sanitizer::uptr*' -->
>              <parameter type-id='type-id-131'/>
>              <!-- int -->
> -            <return type-id='type-id-8'/>
> +            <return type-id='type-id-10'/>
>            </function-decl>
>          </member-function>
>          <member-function access='public' static='yes'>
> @@ -8819,14 +8828,14 @@
>        </class-decl>
>      </namespace-decl>
>      <!-- typedef int __pid_t -->
> -    <typedef-decl name='__pid_t' type-id='type-id-8'
> filepath='/usr/include/bits/types.h' line='143' column='1'
> id='type-id-270'/>
> +    <typedef-decl name='__pid_t' type-id='type-id-10'
> filepath='/usr/include/bits/types.h' line='143' column='1'
> id='type-id-270'/>
>      <namespace-decl name='__sanitizer'>
>        <!-- typedef void (const __sanitizer::SuspendedThreadsList&,
> void*)* __sanitizer::StopTheWorldCallback -->
>        <typedef-decl name='StopTheWorldCallback' type-id='type-id-295'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h'
> line='54' column='1' id='type-id-285'/>
>      </namespace-decl>
>      <namespace-decl name='__sanitizer'>
>        <!-- typedef int __sanitizer::SuspendedThreadID -->
> -      <typedef-decl name='SuspendedThreadID' type-id='type-id-8'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h'
> line='19' column='1' id='type-id-287'/>
> +      <typedef-decl name='SuspendedThreadID' type-id='type-id-10'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h'
> line='19' column='1' id='type-id-287'/>
>      </namespace-decl>
>      <!-- __sanitizer::BlockingMutex* -->
>      <pointer-type-def type-id='type-id-286' size-in-bits='64'
> id='type-id-289'/>
> @@ -8864,7 +8873,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::InternalMmapVector<int>*' -->
>              <parameter type-id='type-id-296' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -9020,7 +9029,7 @@
>      <!-- const int* -->
>      <pointer-type-def type-id='type-id-233' size-in-bits='64'
> id='type-id-300'/>
>      <!-- int& -->
> -    <reference-type-def kind='lvalue' type-id='type-id-8'
> size-in-bits='64' id='type-id-297'/>
> +    <reference-type-def kind='lvalue' type-id='type-id-10'
> size-in-bits='64' id='type-id-297'/>
>      <!-- const __sanitizer::InternalMmapVector<int> -->
>      <qualified-type-def type-id='type-id-291' const='yes'
> id='type-id-305'/>
>    </abi-instr>
> @@ -9068,7 +9077,7 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- void -->
>        <return type-id='type-id-4'/>
>      </function-type>
> @@ -9348,11 +9357,11 @@
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='64'>
>            <!-- int __sanitizer::ExternalSymbolizer::input_fd_ -->
> -          <var-decl name='input_fd_' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc'
> line='295' column='1'/>
> +          <var-decl name='input_fd_' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc'
> line='295' column='1'/>
>          </data-member>
>          <data-member access='private' layout-offset-in-bits='96'>
>            <!-- int __sanitizer::ExternalSymbolizer::output_fd_ -->
> -          <var-decl name='output_fd_' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc'
> line='296' column='1'/>
> +          <var-decl name='output_fd_' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc'
> line='296' column='1'/>
>          </data-member>
>          <data-member access='private' static='yes'>
>            <!-- static const __sanitizer::uptr
> __sanitizer::ExternalSymbolizer::kBufferSize -->
> @@ -9544,9 +9553,9 @@
>          <!-- parameter of type 'char*' -->
>          <parameter type-id='type-id-28'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- int -->
> -        <return type-id='type-id-8'/>
> +        <return type-id='type-id-10'/>
>        </function-decl>
>        <!-- bool __sanitizer::__sanitizer_symbolize_data(const char*,
> __sanitizer::u64, char*, int) -->
>        <function-decl name='__sanitizer_symbolize_data'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc'
> line='312' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -9557,7 +9566,7 @@
>          <!-- parameter of type 'char*' -->
>          <parameter type-id='type-id-28'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- bool -->
>          <return type-id='type-id-124'/>
>        </function-decl>
> @@ -9570,7 +9579,7 @@
>          <!-- parameter of type 'char*' -->
>          <parameter type-id='type-id-28'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- bool -->
>          <return type-id='type-id-124'/>
>        </function-decl>
> @@ -9582,7 +9591,7 @@
>        <!-- parameter of type 'int*' -->
>        <parameter type-id='type-id-42'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- typedef __pid_t -->
>        <return type-id='type-id-270'/>
>      </function-decl>
> @@ -9617,7 +9626,7 @@
>                  <!-- implicit parameter of type
> '__sanitizer::Symbolizer::SymbolizerScope*' -->
>                  <parameter type-id='type-id-320' is-artificial='yes'/>
>                  <!-- artificial parameter of type 'int' -->
> -                <parameter type-id='type-id-8' is-artificial='yes'/>
> +                <parameter type-id='type-id-10' is-artificial='yes'/>
>                  <!-- void -->
>                  <return type-id='type-id-4'/>
>                </function-decl>
> @@ -9639,7 +9648,7 @@
>                  <!-- implicit parameter of type
> '__sanitizer::Symbolizer::SymbolizerScope*' -->
>                  <parameter type-id='type-id-320' is-artificial='yes'/>
>                  <!-- artificial parameter of type 'int' -->
> -                <parameter type-id='type-id-8' is-artificial='yes'/>
> +                <parameter type-id='type-id-10' is-artificial='yes'/>
>                  <!-- void -->
>                  <return type-id='type-id-4'/>
>                </function-decl>
> @@ -9846,7 +9855,7 @@
>        <!-- parameter of type 'char*' -->
>        <parameter type-id='type-id-28'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- bool -->
>        <return type-id='type-id-124'/>
>      </function-type>
> @@ -9877,11 +9886,11 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='320'>
>            <!-- int __sanitizer::AddressInfo::line -->
> -          <var-decl name='line' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h'
> line='32' column='1'/>
> +          <var-decl name='line' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h'
> line='32' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='352'>
>            <!-- int __sanitizer::AddressInfo::column -->
> -          <var-decl name='column' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h'
> line='33' column='1'/>
> +          <var-decl name='column' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h'
> line='33' column='1'/>
>          </data-member>
>          <member-function access='public' constructor='yes'>
>            <!-- __sanitizer::AddressInfo::AddressInfo() -->
> @@ -9952,7 +9961,7 @@
>    </abi-instr>
>    <abi-instr version='1.0' address-size='64'
> path='../../.././libsanitizer/tsan/tsan_clock.cc'
> comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan'
> language='LANG_C_plus_plus'>
>      <!-- int -->
> -    <type-decl name='int' size-in-bits='32' id='type-id-8'/>
> +    <type-decl name='int' size-in-bits='32' id='type-id-10'/>
>      <!-- long long unsigned int -->
>      <type-decl name='long long unsigned int' size-in-bits='64'
> id='type-id-156'/>
>      <!-- long long unsigned int[16384] -->
> @@ -10085,7 +10094,7 @@
>              <!-- implicit parameter of type '__tsan::Vector<long long
> unsigned int>*' -->
>              <parameter type-id='type-id-340' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -10559,7 +10568,7 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='224'>
>            <!-- int __sanitizer::CommonFlags::malloc_context_size -->
> -          <var-decl name='malloc_context_size' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h'
> line='38' column='1'/>
> +          <var-decl name='malloc_context_size' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h'
> line='38' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='256'>
>            <!-- const char* __sanitizer::CommonFlags::log_path -->
> @@ -10567,7 +10576,7 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='320'>
>            <!-- int __sanitizer::CommonFlags::verbosity -->
> -          <var-decl name='verbosity' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h'
> line='44' column='1'/>
> +          <var-decl name='verbosity' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h'
> line='44' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='352'>
>            <!-- bool __sanitizer::CommonFlags::detect_leaks -->
> @@ -10646,7 +10655,7 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='608'>
>            <!-- int __tsan::Flags::exitcode -->
> -          <var-decl name='exitcode' type-id='type-id-8'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='58' column='1'/>
> +          <var-decl name='exitcode' type-id='type-id-10'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='58' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='640'>
>            <!-- bool __tsan::Flags::halt_on_error -->
> @@ -10654,7 +10663,7 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='672'>
>            <!-- int __tsan::Flags::atexit_sleep_ms -->
> -          <var-decl name='atexit_sleep_ms' type-id='type-id-8'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='63' column='1'/>
> +          <var-decl name='atexit_sleep_ms' type-id='type-id-10'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='63' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='704'>
>            <!-- const char* __tsan::Flags::profile_memory -->
> @@ -10662,15 +10671,15 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='768'>
>            <!-- int __tsan::Flags::flush_memory_ms -->
> -          <var-decl name='flush_memory_ms' type-id='type-id-8'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='67' column='1'/>
> +          <var-decl name='flush_memory_ms' type-id='type-id-10'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='67' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='800'>
>            <!-- int __tsan::Flags::flush_symbolizer_ms -->
> -          <var-decl name='flush_symbolizer_ms' type-id='type-id-8'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='69' column='1'/>
> +          <var-decl name='flush_symbolizer_ms' type-id='type-id-10'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='69' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='832'>
>            <!-- int __tsan::Flags::memory_limit_mb -->
> -          <var-decl name='memory_limit_mb' type-id='type-id-8'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='72' column='1'/>
> +          <var-decl name='memory_limit_mb' type-id='type-id-10'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='72' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='864'>
>            <!-- bool __tsan::Flags::stop_on_start -->
> @@ -10682,11 +10691,11 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='896'>
>            <!-- int __tsan::Flags::history_size -->
> -          <var-decl name='history_size' type-id='type-id-8'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='82' column='1'/>
> +          <var-decl name='history_size' type-id='type-id-10'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='82' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='928'>
>            <!-- int __tsan::Flags::io_sync -->
> -          <var-decl name='io_sync' type-id='type-id-8'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='87' column='1'/>
> +          <var-decl name='io_sync' type-id='type-id-10'
> visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h'
> line='87' column='1'/>
>          </data-member>
>        </class-decl>
>      </namespace-decl>
> @@ -10856,7 +10865,7 @@
>            <!-- implicit parameter of type 'BlockingCall*' -->
>            <parameter type-id='type-id-398' is-artificial='yes'/>
>            <!-- artificial parameter of type 'int' -->
> -          <parameter type-id='type-id-8' is-artificial='yes'/>
> +          <parameter type-id='type-id-10' is-artificial='yes'/>
>            <!-- void -->
>            <return type-id='type-id-4'/>
>          </function-decl>
> @@ -10899,7 +10908,7 @@
>            <!-- implicit parameter of type 'ScopedSyscall*' -->
>            <parameter type-id='type-id-403' is-artificial='yes'/>
>            <!-- artificial parameter of type 'int' -->
> -          <parameter type-id='type-id-8' is-artificial='yes'/>
> +          <parameter type-id='type-id-10' is-artificial='yes'/>
>            <!-- void -->
>            <return type-id='type-id-4'/>
>          </function-decl>
> @@ -10933,7 +10942,7 @@
>        </data-member>
>        <data-member access='private' layout-offset-in-bits='17472'>
>          <!-- int AtExitContext::pos_ -->
> -        <var-decl name='pos_' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='337'
> column='1'/>
> +        <var-decl name='pos_' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='337'
> column='1'/>
>        </data-member>
>        <member-function access='public' constructor='yes'>
>          <!-- AtExitContext::AtExitContext() -->
> @@ -10960,7 +10969,7 @@
>            <!-- parameter of type 'void*' -->
>            <parameter type-id='type-id-1'/>
>            <!-- int -->
> -          <return type-id='type-id-8'/>
> +          <return type-id='type-id-10'/>
>          </function-decl>
>        </member-function>
>        <member-function access='public'>
> @@ -11016,7 +11025,7 @@
>            <!-- implicit parameter of type 'ScopedInterceptor*' -->
>            <parameter type-id='type-id-411' is-artificial='yes'/>
>            <!-- artificial parameter of type 'int' -->
> -          <parameter type-id='type-id-8' is-artificial='yes'/>
> +          <parameter type-id='type-id-10' is-artificial='yes'/>
>            <!-- void -->
>            <return type-id='type-id-4'/>
>          </function-decl>
> @@ -11042,7 +11051,7 @@
>            <!-- implicit parameter of type 'ScopedInterceptor*' -->
>            <parameter type-id='type-id-411' is-artificial='yes'/>
>            <!-- artificial parameter of type 'int' -->
> -          <parameter type-id='type-id-8' is-artificial='yes'/>
> +          <parameter type-id='type-id-10' is-artificial='yes'/>
>            <!-- void -->
>            <return type-id='type-id-4'/>
>          </function-decl>
> @@ -11056,7 +11065,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='64'>
>          <!-- int sanitizer_kernel_msghdr::msg_namelen -->
> -        <var-decl name='msg_namelen' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc'
> line='95' column='1'/>
> +        <var-decl name='msg_namelen' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc'
> line='95' column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='128'>
>          <!-- sanitizer_kernel_iovec* sanitizer_kernel_msghdr::msg_iov -->
> @@ -11157,7 +11166,7 @@
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1088'>
>          <!-- int sigaction_t::sa_flags -->
> -        <var-decl name='sa_flags' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='97'
> column='1'/>
> +        <var-decl name='sa_flags' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='97'
> column='1'/>
>        </data-member>
>        <data-member access='public' layout-offset-in-bits='1152'>
>          <!-- void ()* sigaction_t::sa_restorer -->
> @@ -12418,7 +12427,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
>              <parameter type-id='type-id-941' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -12575,7 +12584,7 @@
>              <!-- implicit parameter of type
> '__sanitizer::InternalMmapVector<__sanitizer::Suppression*>*' -->
>              <parameter type-id='type-id-939' is-artificial='yes'/>
>              <!-- artificial parameter of type 'int' -->
> -            <parameter type-id='type-id-8' is-artificial='yes'/>
> +            <parameter type-id='type-id-10' is-artificial='yes'/>
>              <!-- void -->
>              <return type-id='type-id-4'/>
>            </function-decl>
> @@ -13038,7 +13047,7 @@
>        <class-decl name='__sanitizer_pollfd' size-in-bits='64'
> is-struct='yes' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='479' column='1' id='type-id-1000'>
>          <data-member access='public' layout-offset-in-bits='0'>
>            <!-- int __sanitizer::__sanitizer_pollfd::fd -->
> -          <var-decl name='fd' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='480' column='1'/>
> +          <var-decl name='fd' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='480' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='32'>
>            <!-- short int __sanitizer::__sanitizer_pollfd::events -->
> @@ -13066,7 +13075,7 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='64'>
>            <!-- int __sanitizer::__sanitizer___sysctl_args::nlen -->
> -          <var-decl name='nlen' type-id='type-id-8' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='131' column='1'/>
> +          <var-decl name='nlen' type-id='type-id-10' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='131' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='128'>
>            <!-- void* __sanitizer::__sanitizer___sysctl_args::oldval -->
> @@ -13131,11 +13140,11 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='256'>
>            <!-- int __sanitizer::__sanitizer_mntent::mnt_freq -->
> -          <var-decl name='mnt_freq' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='281' column='1'/>
> +          <var-decl name='mnt_freq' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='281' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='288'>
>            <!-- int __sanitizer::__sanitizer_mntent::mnt_passno -->
> -          <var-decl name='mnt_passno' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='282' column='1'/>
> +          <var-decl name='mnt_passno' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='282' column='1'/>
>          </data-member>
>        </class-decl>
>        <!-- struct __sanitizer::__sanitizer_sigset_t -->
> @@ -13220,7 +13229,7 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='384'>
>            <!-- int __sanitizer::__sanitizer_msghdr::msg_flags -->
> -          <var-decl name='msg_flags' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='309' column='1'/>
> +          <var-decl name='msg_flags' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='309' column='1'/>
>          </data-member>
>        </class-decl>
>        <!-- struct __sanitizer::__sanitizer_hostent -->
> @@ -13235,11 +13244,11 @@
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='128'>
>            <!-- int __sanitizer::__sanitizer_hostent::h_addrtype -->
> -          <var-decl name='h_addrtype' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='474' column='1'/>
> +          <var-decl name='h_addrtype' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='474' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='160'>
>            <!-- int __sanitizer::__sanitizer_hostent::h_length -->
> -          <var-decl name='h_length' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='475' column='1'/>
> +          <var-decl name='h_length' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='475' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='192'>
>            <!-- char** __sanitizer::__sanitizer_hostent::h_addr_list -->
> @@ -13250,39 +13259,39 @@
>        <class-decl name='__sanitizer_tm' size-in-bits='448'
> is-struct='yes' visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='261' column='1' id='type-id-1003'>
>          <data-member access='public' layout-offset-in-bits='0'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_sec -->
> -          <var-decl name='tm_sec' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='262' column='1'/>
> +          <var-decl name='tm_sec' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='262' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='32'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_min -->
> -          <var-decl name='tm_min' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='263' column='1'/>
> +          <var-decl name='tm_min' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='263' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='64'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_hour -->
> -          <var-decl name='tm_hour' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='264' column='1'/>
> +          <var-decl name='tm_hour' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='264' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='96'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_mday -->
> -          <var-decl name='tm_mday' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='265' column='1'/>
> +          <var-decl name='tm_mday' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='265' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='128'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_mon -->
> -          <var-decl name='tm_mon' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='266' column='1'/>
> +          <var-decl name='tm_mon' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='266' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='160'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_year -->
> -          <var-decl name='tm_year' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='267' column='1'/>
> +          <var-decl name='tm_year' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='267' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='192'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_wday -->
> -          <var-decl name='tm_wday' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='268' column='1'/>
> +          <var-decl name='tm_wday' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='268' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='224'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_yday -->
> -          <var-decl name='tm_yday' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='269' column='1'/>
> +          <var-decl name='tm_yday' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='269' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='256'>
>            <!-- int __sanitizer::__sanitizer_tm::tm_isdst -->
> -          <var-decl name='tm_isdst' type-id='type-id-8'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='270' column='1'/>
> +          <var-decl name='tm_isdst' type-id='type-id-10'
> visibility='default'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='270' column='1'/>
>          </data-member>
>          <data-member access='public' layout-offset-in-bits='320'>
>            <!-- long int __sanitizer::__sanitizer_tm::tm_gmtoff -->
> @@ -13300,9 +13309,9 @@
>        <!-- int __sanitizer::ToLower(int) -->
>        <function-decl name='ToLower'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h'
> line='306' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- int -->
> -        <return type-id='type-id-8'/>
> +        <return type-id='type-id-10'/>
>        </function-decl>
>        <!-- bool
> __sanitizer::atomic_compare_exchange_strong<__sanitizer::atomic_uint32_t>(volatile
> __sanitizer::atomic_uint32_t*, __sanitizer::atomic_uint32_t::Type*,
> __sanitizer::atomic_uint32_t::Type, __sanitizer::memory_order) -->
>        <function-decl
> name='atomic_compare_exchange_strong&lt;__sanitizer::atomic_uint32_t&gt;'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h'
> line='108' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -13329,11 +13338,11 @@
>        <!-- int __sanitizer::Min<int>(int, int) -->
>        <function-decl name='Min&lt;int&gt;'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h'
> line='290' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- int -->
> -        <return type-id='type-id-8'/>
> +        <return type-id='type-id-10'/>
>        </function-decl>
>        <!-- __sanitizer::atomic_uint32_t::Type
> __sanitizer::atomic_load<__sanitizer::atomic_uint32_t>(const volatile
> __sanitizer::atomic_uint32_t*, __sanitizer::memory_order) -->
>        <function-decl
> name='atomic_load&lt;__sanitizer::atomic_uint32_t&gt;'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h'
> line='36' column='1' visibility='default' binding='global'
> size-in-bits='64'>
> @@ -13385,7 +13394,7 @@
>          <!-- parameter of type 'const char*' -->
>          <parameter type-id='type-id-2'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- char* -->
>          <return type-id='type-id-28'/>
>        </function-decl>
> @@ -13413,7 +13422,7 @@
>        <!-- __sanitizer::uptr __sanitizer::__sanitizer_in_addr_sz(int) -->
>        <function-decl name='__sanitizer_in_addr_sz'
> mangled-name='_ZN11__sanitizer22__sanitizer_in_addr_szEi'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h'
> line='443' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- typedef __sanitizer::uptr -->
>          <return type-id='type-id-99'/>
>        </function-decl>
> @@ -13459,7 +13468,7 @@
>        <!-- __sanitizer::uptr __sanitizer::internal_sigprocmask(int,
> __sanitizer::__sanitizer_kernel_sigset_t*,
> __sanitizer::__sanitizer_kernel_sigset_t*) -->
>        <function-decl name='internal_sigprocmask'
> mangled-name='_ZN11__sanitizer20internal_sigprocmaskEiPNS_27__sanitizer_kernel_sigset_tES1_'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h'
> line='35' column='1' visibility='default' binding='global'
> size-in-bits='64'>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type
> '__sanitizer::__sanitizer_kernel_sigset_t*' -->
>          <parameter type-id='type-id-202'/>
>          <!-- parameter of type
> '__sanitizer::__sanitizer_kernel_sigset_t*' -->
> @@ -13525,7 +13534,7 @@
>          <!-- parameter of type 'bool' -->
>          <parameter type-id='type-id-124'/>
>          <!-- int -->
> -        <return type-id='type-id-8'/>
> +        <return type-id='type-id-10'/>
>        </function-decl>
>        <!-- void __tsan::MutexLock(__tsan::ThreadState*,
> __sanitizer::uptr, __sanitizer::uptr, int) -->
>        <function-decl name='MutexLock'
> mangled-name='_ZN6__tsan9MutexLockEPNS_11ThreadStateEmmi'
> filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='710' column='1'
> visibility='default' binding='global' size-in-bits='64'>
> @@ -13536,7 +13545,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13558,7 +13567,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13569,7 +13578,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13580,9 +13589,9 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13593,7 +13602,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13604,7 +13613,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13631,7 +13640,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13642,7 +13651,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13660,9 +13669,9 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13673,7 +13682,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13684,7 +13693,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13695,7 +13704,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13706,7 +13715,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13717,7 +13726,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13728,7 +13737,7 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13739,9 +13748,9 @@
>          <!-- parameter of type 'typedef __sanitizer::uptr' -->
>          <parameter type-id='type-id-99'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- parameter of type 'int' -->
> -        <parameter type-id='type-id-8'/>
> +        <parameter type-id='type-id-10'/>
>          <!-- void -->
>          <return type-id='type-id-4'/>
>        </function-decl>
> @@ -13870,7 +13879,7 @@
>        <!-- parameter of type 'typedef __sanitizer::uptr' -->
>        <parameter type-id='type-id-99' name='len'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_munlock(void*, __sanitizer::uptr) -->
>      <function-decl name='__interceptor_munlock' mangled-name='munlock'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1796'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='munlock'>
> @@ -13879,47 +13888,47 @@
>        <!-- parameter of type 'typedef __sanitizer::uptr' -->
>        <parameter type-id='type-id-99' name='len'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_mlockall(int) -->
>      <function-decl name='__interceptor_mlockall' mangled-name='mlockall'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='mlockall'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8'/>
> +      <parameter type-id='type-id-10'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_munlockall() -->
>      <function-decl name='__interceptor_munlockall'
> mangled-name='__interceptor_munlockall'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1806'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='__interceptor_munlockall'>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_setjmp(void*) -->
>      <function-decl name='__interceptor_setjmp'
> mangled-name='__interceptor_setjmp'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='__interceptor_setjmp'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='env'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor__setjmp(void*) -->
>      <function-decl name='__interceptor__setjmp'
> mangled-name='__interceptor__setjmp'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='431'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='__interceptor__setjmp'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='env'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_sigsetjmp(void*) -->
>      <function-decl name='__interceptor_sigsetjmp'
> mangled-name='__interceptor_sigsetjmp'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='438'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='__interceptor_sigsetjmp'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='env'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor___sigsetjmp(void*) -->
>      <function-decl name='__interceptor___sigsetjmp'
> mangled-name='__interceptor___sigsetjmp'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='445'
> column='1' visibility='default' binding='global' size-in-bits='64'
> elf-symbol-id='__interceptor___sigsetjmp'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='env'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- void __sanitizer_syscall_post_impl_recvmsg(long int, long int,
> sanitizer_kernel_msghdr*, long int) -->
>      <function-decl name='__sanitizer_syscall_post_impl_recvmsg'
> mangled-name='__sanitizer_syscall_post_impl_recvmsg'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc'
> line='157' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_recvmsg'>
> @@ -20348,7 +20357,7 @@
>        <!-- parameter of type 'SIZE_T*' -->
>        <parameter type-id='type-id-935' name='n'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2851' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='delim'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2851' column='1'/>
> +      <parameter type-id='type-id-10' name='delim'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2851' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='stream'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2851' column='1'/>
>        <!-- typedef SSIZE_T -->
> @@ -20372,7 +20381,7 @@
>        <!-- parameter of type 'long int*' -->
>        <parameter type-id='type-id-1181' name='result'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2825' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_drand48_r(void*, double*) -->
>      <function-decl name='__interceptor_drand48_r'
> mangled-name='drand48_r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2818' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='drand48_r'>
> @@ -20381,7 +20390,7 @@
>        <!-- parameter of type 'double*' -->
>        <parameter type-id='type-id-1072' name='result'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2818' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- long double __interceptor_lgammal_r(long double, int*) -->
>      <function-decl name='__interceptor_lgammal_r'
> mangled-name='__interceptor_lgammal_r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2802' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_lgammal_r'>
> @@ -20504,7 +20513,7 @@
>        <!-- parameter of type 'const char*' -->
>        <parameter type-id='type-id-2' name='name'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2685' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- char* __interceptor_tempnam(char*, char*) -->
>      <function-decl name='__interceptor_tempnam' mangled-name='tempnam'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2670' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='tempnam'>
> @@ -20538,7 +20547,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='cpuset'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2621' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_attr_getinheritsched(void*, void*) -->
>      <function-decl name='__interceptor_pthread_attr_getinheritsched'
> mangled-name='__interceptor_pthread_attr_getinheritsched'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1' visibility='default' binding='global'
> size-in-bits='64'
> elf-symbol-id='__interceptor_pthread_attr_getinheritsched'>
> @@ -20547,7 +20556,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_attr_getstack(void*, void**, SIZE_T*)
> -->
>      <function-decl name='__interceptor_pthread_attr_getstack'
> mangled-name='pthread_attr_getstack'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2581' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='pthread_attr_getstack'>
> @@ -20558,7 +20567,7 @@
>        <!-- parameter of type 'SIZE_T*' -->
>        <parameter type-id='type-id-935' name='size'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2581' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_attr_getstacksize(void*, void*) -->
>      <function-decl name='__interceptor_pthread_attr_getstacksize'
> mangled-name='__interceptor_pthread_attr_getstacksize'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2580' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getstacksize'>
> @@ -20567,7 +20576,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_attr_getscope(void*, void*) -->
>      <function-decl name='__interceptor_pthread_attr_getscope'
> mangled-name='pthread_attr_getscope'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2579' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='pthread_attr_getscope'>
> @@ -20576,7 +20585,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_attr_getschedpolicy(void*, void*) -->
>      <function-decl name='__interceptor_pthread_attr_getschedpolicy'
> mangled-name='pthread_attr_getschedpolicy'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2578' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='pthread_attr_getschedpolicy'>
> @@ -20585,7 +20594,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_attr_getschedparam(void*, void*) -->
>      <function-decl name='__interceptor_pthread_attr_getschedparam'
> mangled-name='__interceptor_pthread_attr_getschedparam'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2577' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getschedparam'>
> @@ -20594,7 +20603,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_attr_getguardsize(void*, void*) -->
>      <function-decl name='__interceptor_pthread_attr_getguardsize'
> mangled-name='pthread_attr_getguardsize'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2576' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='pthread_attr_getguardsize'>
> @@ -20603,7 +20612,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_attr_getdetachstate(void*, void*) -->
>      <function-decl name='__interceptor_pthread_attr_getdetachstate'
> mangled-name='pthread_attr_getdetachstate'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2575' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='pthread_attr_getdetachstate'>
> @@ -20612,7 +20621,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_random_r(void*, __sanitizer::u32*) -->
>      <function-decl name='__interceptor_random_r'
> mangled-name='__interceptor_random_r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2549' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_random_r'>
> @@ -20621,18 +20630,18 @@
>        <!-- parameter of type '__sanitizer::u32*' -->
>        <parameter type-id='type-id-1011' name='result'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2549' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_shmctl(int, int, void*) -->
>      <function-decl name='__interceptor_shmctl'
> mangled-name='__interceptor_shmctl'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2527' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_shmctl'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='shmid'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2527' column='1'/>
> +      <parameter type-id='type-id-10' name='shmid'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2527' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='cmd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2527' column='1'/>
> +      <parameter type-id='type-id-10' name='cmd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2527' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2527' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- __sanitizer::__sanitizer_ether_addr*
> __interceptor_ether_aton_r(char*, __sanitizer::__sanitizer_ether_addr*) -->
>      <function-decl name='__interceptor_ether_aton_r'
> mangled-name='ether_aton_r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2510' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='ether_aton_r'>
> @@ -20661,7 +20670,7 @@
>        <!-- parameter of type 'char*' -->
>        <parameter type-id='type-id-28' name='hostname'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2478' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_ether_hostton(char*,
> __sanitizer::__sanitizer_ether_addr*) -->
>      <function-decl name='__interceptor_ether_hostton'
> mangled-name='ether_hostton'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2469' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='ether_hostton'>
> @@ -20670,7 +20679,7 @@
>        <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
>        <parameter type-id='type-id-975' name='addr'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2469' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_ether_ntohost(char*,
> __sanitizer::__sanitizer_ether_addr*) -->
>      <function-decl name='__interceptor_ether_ntohost'
> mangled-name='ether_ntohost'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2460' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='ether_ntohost'>
> @@ -20679,7 +20688,7 @@
>        <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
>        <parameter type-id='type-id-975' name='addr'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2469' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- __sanitizer::__sanitizer_ether_addr*
> __interceptor_ether_aton(char*) -->
>      <function-decl name='__interceptor_ether_aton'
> mangled-name='__interceptor_ether_aton'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2452' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_ether_aton'>
> @@ -20702,16 +20711,16 @@
>        <!-- parameter of type 'typedef __sanitizer::u32' -->
>        <parameter type-id='type-id-196' name='group'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2431' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_fstatvfs64(int, void*) -->
>      <function-decl name='__interceptor_fstatvfs64'
> mangled-name='fstatvfs64'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='fstatvfs64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='fd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
> +      <parameter type-id='type-id-10' name='fd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_statvfs64(char*, void*) -->
>      <function-decl name='__interceptor_statvfs64'
> mangled-name='statvfs64'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2408' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='statvfs64'>
> @@ -20720,16 +20729,16 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2408' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_fstatvfs(int, void*) -->
>      <function-decl name='__interceptor_fstatvfs'
> mangled-name='__interceptor_fstatvfs'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2393' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_fstatvfs'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='fd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
> +      <parameter type-id='type-id-10' name='fd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_statvfs(char*, void*) -->
>      <function-decl name='__interceptor_statvfs'
> mangled-name='__interceptor_statvfs'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2385' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_statvfs'>
> @@ -20738,16 +20747,16 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2408' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_fstatfs64(int, void*) -->
>      <function-decl name='__interceptor_fstatfs64'
> mangled-name='fstatfs64'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2370' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='fstatfs64'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='fd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
> +      <parameter type-id='type-id-10' name='fd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_statfs64(char*, void*) -->
>      <function-decl name='__interceptor_statfs64'
> mangled-name='__interceptor_statfs64'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2362' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_statfs64'>
> @@ -20756,16 +20765,16 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2408' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_fstatfs(int, void*) -->
>      <function-decl name='__interceptor_fstatfs'
> mangled-name='__interceptor_fstatfs'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2347' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_fstatfs'>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='fd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
> +      <parameter type-id='type-id-10' name='fd'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2416' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_statfs(char*, void*) -->
>      <function-decl name='__interceptor_statfs'
> mangled-name='__interceptor_statfs'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2339' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_statfs'>
> @@ -20774,7 +20783,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2408' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- __sanitizer::__sanitizer_mntent*
> __interceptor_getmntent_r(void*, __sanitizer::__sanitizer_mntent*, char*,
> int) -->
>      <function-decl name='__interceptor_getmntent_r'
> mangled-name='getmntent_r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2325' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='getmntent_r'>
> @@ -20785,7 +20794,7 @@
>        <!-- parameter of type 'char*' -->
>        <parameter type-id='type-id-28' name='buf'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2325' column='1'/>
>        <!-- parameter of type 'int' -->
> -      <parameter type-id='type-id-8' name='buflen'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2325' column='1'/>
> +      <parameter type-id='type-id-10' name='buflen'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2325' column='1'/>
>        <!-- __sanitizer::__sanitizer_mntent* -->
>        <return type-id='type-id-993'/>
>      </function-decl>
> @@ -20801,14 +20810,14 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='env'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_cond_signal(void*) -->
>      <function-decl name='__interceptor_pthread_cond_signal'
> mangled-name='pthread_cond_signal'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2264' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='pthread_cond_signal'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='env'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_cond_init(void*, void*) -->
>      <function-decl name='__interceptor_pthread_cond_init'
> mangled-name='__interceptor_pthread_cond_init'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2257' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_init'>
> @@ -20817,7 +20826,7 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_cond_wait(void*, void*) -->
>      <function-decl name='__interceptor_pthread_cond_wait'
> mangled-name='__interceptor_pthread_cond_wait'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2247' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_wait'>
> @@ -20826,26 +20835,26 @@
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='r'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2612' column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_mutex_unlock(void*) -->
>      <function-decl name='__interceptor_pthread_mutex_unlock'
> mangled-name='__interceptor_pthread_mutex_unlock'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2231' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_unlock'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='env'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1'/>
>        <!-- int -->
> -      <return type-id='type-id-8'/>
> +      <return type-id='type-id-10'/>
>      </function-decl>
>      <!-- int __interceptor_pthread_mutex_lock(void*) -->
>      <function-decl name='__interceptor_pthread_mutex_lock'
> mangled-name='pthread_mutex_lock'
> filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc'
> line='2220' column='1' visibility='default' binding='global'
> size-in-bits='64' elf-symbol-id='pthread_mutex_lock'>
>        <!-- parameter of type 'void*' -->
>        <parameter type-id='type-id-1' name='env'
> filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423'
> column='1'/>